Skip to content
Open
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
36 changes: 30 additions & 6 deletions sway-core/src/ir_generation/function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5276,12 +5276,33 @@ impl<'a> FnCompiler<'a> {
index_expr: &ty::TyExpression,
span_md_idx: Option<MetadataIndex>,
) -> Result<TerminatorValue, CompileError> {
let prefix_value = return_on_termination_or_extract!(self.compile_expression_to_memory(
context,
md_mgr,
prefix_expr
)?)
let mut prefix_value = return_on_termination_or_extract!(
self.compile_expression_to_memory(context, md_mgr, prefix_expr)?
)
.expect_memory();

// When the prefix is a reference (e.g. a `ref mut self` argument), the compiled value
// is a pointer to the reference, i.e. a pointer to a pointer to the indexed aggregate.
// We need to dereference it, peeling off the extra levels of indirection, until we
// reach the pointer that actually points to the array or slice.
while let Some(TypeContent::TypedPointer(pointee)) = prefix_value
.get_type(context)
.map(|ty| ty.get_content(context))
{
if matches!(
pointee.get_content(context),
TypeContent::TypedPointer(_) | TypeContent::Pointer
) {
prefix_value = self
.current_block
.append(context)
.load(prefix_value)
.add_metadatum(context, span_md_idx);
} else {
break;
}
}

let prefix_type = prefix_value.get_type(context).unwrap();

let index_value = return_on_termination_or_extract!(
Expand All @@ -5300,7 +5321,10 @@ impl<'a> FnCompiler<'a> {
prefix_value,
index_value,
),
_ => todo!(),
_ => Err(CompileError::Internal(
"Unsupported array value for index expression.",
prefix_expr.span.clone(),
)),
},
TypeContent::TypedSlice(..) => self.compile_indexing_slices(
context,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ where
let mut i = 0;
while i < N {
self[i] = default;
// TODO: Uncomment this `assert_eq` once https://github.com/FuelLabs/sway/issues/7602 is fixed.
// assert_eq(self[i], default);
assert_eq(self[i], default);
i += 1;
}
}
Expand Down
Loading