Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions compiler/noirc_evaluator/src/acir/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1422,6 +1422,7 @@ impl<'a> Context<'a> {
let new_slice_length = self.acir_context.sub_var(slice_length, one)?;

let slice = self.convert_value(slice_contents, dfg);
let is_dynamic = matches!(slice, AcirValue::DynamicArray(_));

let mut new_slice = self.read_array(slice)?;

Expand All @@ -1443,6 +1444,11 @@ impl<'a> Context<'a> {

// It is expected that the `popped_elements_size` is the flattened size of the elements,
// as the input slice should be a dynamic array which is represented by flat memory.
// However in some cases the input slice is an Array with a nested structure,
// in which case we only need to pop the items that represent a single entry.
let popped_elements_size =
if is_dynamic { popped_elements_size } else { element_size };

new_slice = new_slice.slice(popped_elements_size..);

popped_elements.push(AcirValue::Var(new_slice_length, AcirType::field()));
Expand Down
6 changes: 6 additions & 0 deletions test_programs/execution_success/regression_9593/Nargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[package]
name = "regression_9593"
type = "bin"
authors = [""]

[dependencies]
2 changes: 2 additions & 0 deletions test_programs/execution_success/regression_9593/Prover.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
a = true
return = "Cc"
11 changes: 11 additions & 0 deletions test_programs/execution_success/regression_9593/src/main.nr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
fn main(a: bool) -> pub str<2> {
let (_, d) = {
let b: [str<2>] = if a {
&["Aa", "Bb", "Cc"]
} else {
&["Dd", "Ee"]
};
b.pop_front()
};
d[1]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading