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
38 changes: 38 additions & 0 deletions compiler/noirc_evaluator/src/ssa/opt/mem2reg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,19 @@ impl<'f> PerFunctionContext<'f> {
expr,
AliasSet::known_multiple(vec![*then_value, *else_value].into()),
);

// `then_value` and `else_value` are now aliased by `result`
if let Some(then_expr) = references.expressions.get_mut(then_value) {
if let Some(then_aliases) = references.aliases.get_mut(then_expr) {
then_aliases.insert(result);
}
}

if let Some(else_expr) = references.expressions.get_mut(else_value) {
if let Some(else_aliases) = references.aliases.get_mut(else_expr) {
else_aliases.insert(result);
}
}
}
}
_ => (),
Expand Down Expand Up @@ -1571,6 +1584,31 @@ mod tests {
");
}

#[test]
fn if_aliases_each_branch() {
let src = "
brillig(inline) predicate_pure fn main f0 {
b0(v0: u1):
v1 = allocate -> &mut Field
store Field 0 at v1
v3 = allocate -> &mut Field
store Field 1 at v3
v5 = not v0
v6 = if v0 then v1 else (if v5) v3
store Field 9 at v6
v8 = load v1 -> Field
constrain v8 == Field 9
v9 = load v3 -> Field
constrain v9 == Field 1
return
}
";

let ssa = Ssa::from_str(src).unwrap();
let ssa = ssa.mem2reg();
assert_normalized_ssa_equals(ssa, src);
}

#[test]
fn reuses_last_load_from_single_predecessor_block() {
let src = r#"
Expand Down

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

Loading
Loading