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
4 changes: 3 additions & 1 deletion compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,10 @@ impl FunctionContext<'_> {
}

fn codegen_index(&mut self, index: &ast::Index) -> Result<Values, RuntimeError> {
let array_or_slice = self.codegen_expression(&index.collection)?.into_value_list(self);
// Generate the index value first, it might modify the collection itself.
let index_value = self.codegen_non_tuple_expression(&index.index)?;
// The code for the collection will load it if it's mutable. It must be after the index to see any modifications.
let array_or_slice = self.codegen_expression(&index.collection)?.into_value_list(self);
// Slices are represented as a tuple in the form: (length, slice contents).
// Thus, slices require two value ids for their representation.
let (array, slice_length) = if array_or_slice.len() > 1 {
Expand Down
6 changes: 3 additions & 3 deletions compiler/noirc_frontend/src/hir/comptime/interpreter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -929,13 +929,13 @@ impl<'local, 'interner> Interpreter<'local, 'interner> {
}

fn evaluate_index(&mut self, index: HirIndexExpression, id: ExprId) -> IResult<Value> {
let idx = self.evaluate(index.index)?;
let array = self.evaluate(index.collection)?;
let index = self.evaluate(index.index)?;

let location = self.elaborator.interner.expr_location(&id);
let (array, index) = bounds_check(array, index, location)?;
let (array, idx) = bounds_check(array, idx, location)?;

Ok(array[index].clone())
Ok(array[idx].clone())
}

fn evaluate_constructor(
Expand Down
6 changes: 6 additions & 0 deletions test_programs/execution_success/regression_9329/Nargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[package]
name = "regression_9329"
type = "bin"
authors = [""]

[dependencies]
3 changes: 3 additions & 0 deletions test_programs/execution_success/regression_9329/Prover.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

b = [10, 20]
return = 21
16 changes: 16 additions & 0 deletions test_programs/execution_success/regression_9329/src/main.nr
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
fn main(b: [i8; 2]) -> pub i8 {
let i = foo(b);
let c = comptime { foo([10, 20]) };
assert_eq(i, c);
i
}

fn foo(mut b: [i8; 2]) -> i8 {
b[{
let d = 1;
for _ in 0..2 {
b[0] = b[1] + d;
}
0
}]
}

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
Loading