Skip to content

fix: Complete call stacks with no_predicates #5418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfecher merged 1 commit into from
Jul 5, 2024
Merged

fix: Complete call stacks with no_predicates #5418

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions compiler/noirc_evaluator/src/ssa/opt/inlining.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,19 +517,13 @@ impl<'function> PerFunctionContext<'function> {
let old_results = self.source_function.dfg.instruction_results(call_id);
let arguments = vecmap(arguments, |arg| self.translate_value(*arg));

let mut call_stack = self.source_function.dfg.get_call_stack(call_id);
let has_location = !call_stack.is_empty();

// Function calls created by the defunctionalization pass will not have source locations
if let Some(location) = call_stack.pop_back() {
self.context.call_stack.push_back(location);
}
let call_stack = self.source_function.dfg.get_call_stack(call_id);
let call_stack_len = call_stack.len();
self.context.call_stack.append(call_stack);

let new_results = self.context.inline_function(ssa, function, &arguments);

if has_location {
self.context.call_stack.pop_back();
}
self.context.call_stack.truncate(self.context.call_stack.len() - call_stack_len);

let new_results = InsertInstructionResult::Results(call_id, &new_results);
Self::insert_new_instruction_results(&mut self.values, old_results, new_results);
Expand Down