Fix block merge under loop

[spapinistarkware]

This change is 

[spapinistarkware]

Current dependencies on/for this PR:

• main
  • PR Fix block merge under loop #3770 👈

This comment was auto-generated by Graphite.

[orizi]

Reviewed 3 of 6 files at r1, all commit messages.
Reviewable status: 3 of 6 files reviewed, 3 unresolved discussions (waiting on @spapinistarkware)

---

crates/cairo-lang-lowering/src/lower/block_builder.rs line 100 at r1 (raw file):

        );
        self.changed_semantics.insert(member_path);
    }

Suggestion:

    pub fn update_ref(
        &mut self,
        ctx: &mut LoweringContext<'_, '_>,
        member_path: &ExprVarMemberPath,
        var: VariableId,
    ) {
        let location = ctx.get_location(member_path.stable_ptr().untyped());
        self.update_ref_raw(ctx, member_path, var, location)
    }

    pub fn update_ref_raw(
        &mut self,
        ctx: &mut LoweringContext<'_, '_>,
        member_path: MemberPath,
        var: VariableId,
        location: LocationId,
    ) {
        self.semantics.update(
            BlockStructRecomposer { statements: &mut self.statements, ctx, location },
            &member_path,
            var,
        );
        self.changed_semantics.insert(member_path);
    }

---

crates/cairo-lang-lowering/src/lower/block_builder.rs line 114 at r1 (raw file):

            )
            .map(|var_id| VarUsage { var_id, location })
    }

Suggestion:

    pub fn get_ref(
        &mut self,
        ctx: &mut LoweringContext<'_, '_>,
        member_path: &ExprVarMemberPath,
    ) -> Option<VarUsage> {
        let location = ctx.get_location(member_path.stable_ptr().untyped());
        self.get_ref_raw(ctx, member_path, location)
    }

---

crates/cairo-lang-lowering/src/lower/refs.rs line 15 at r1 (raw file):

#[derive(Clone, Default, Debug)]
pub struct SemanticLoweringMapping {
    pub scattered: OrderedHashMap<MemberPath, Value>,

is this used?

Suggestion:

pub struct SemanticLoweringMapping {
    scattered: OrderedHashMap<MemberPath, Value>,

[spapinistarkware]

Reviewable status: 3 of 6 files reviewed, 3 unresolved discussions (waiting on @orizi)

---

crates/cairo-lang-lowering/src/lower/block_builder.rs line 100 at r1 (raw file):

        );
        self.changed_semantics.insert(member_path);
    }

Done.

---

crates/cairo-lang-lowering/src/lower/block_builder.rs line 114 at r1 (raw file):

            )
            .map(|var_id| VarUsage { var_id, location })
    }

Done.

---

crates/cairo-lang-lowering/src/lower/refs.rs line 15 at r1 (raw file):

Previously, orizi wrote…

is this used?

Done.

[orizi]

Reviewed 1 of 6 files at r1, 5 of 5 files at r2, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @spapinistarkware)