fmt

Author: brockelmore

.github/workflows/ci.yml

@@ -118,16 +118,17 @@ jobs:
         with:
           tools: cargo-nextest
           rust-cache-shared-key: "stable"
-      - run: just e2e-ci
       - name: Gas snapshot diff
         if: github.event_name == 'pull_request'
         run: |
-          git show origin/${{ github.base_ref }}:crates/e2e/.gas-snapshot > /tmp/base-gas-snapshot || true
-          if [ -f /tmp/base-gas-snapshot ] && [ -f crates/e2e/.gas-snapshot ]; then
-            python3 scripts/gas-diff.py /tmp/base-gas-snapshot crates/e2e/.gas-snapshot > /tmp/gas-diff.md
+          git show origin/${{ github.base_ref }}:crates/e2e/.gas-snapshot > /tmp/base-gas-snapshot 2>/dev/null || true
+          git show HEAD:crates/e2e/.gas-snapshot > /tmp/head-gas-snapshot 2>/dev/null || true
+          if [ -s /tmp/base-gas-snapshot ] && [ -s /tmp/head-gas-snapshot ]; then
+            python3 scripts/gas-diff.py /tmp/base-gas-snapshot /tmp/head-gas-snapshot > /tmp/gas-diff.md
           else
             echo "No gas snapshots to compare." > /tmp/gas-diff.md
           fi
+      - run: just e2e-ci
       - name: Post gas diff comment
         if: github.event_name == 'pull_request'
         uses: actions/github-script@v7

crates/ir/src/mem_region.rs

@@ -22,9 +22,9 @@ use crate::schema::{EvmBaseType, EvmConstant, EvmContext, EvmExpr, EvmType, RcEx
 /// branches of an `If` can share the same memory offsets.
 enum RegionScope {
     /// Children execute sequentially — all must be non-overlapping.
-    Sequential(Vec<RegionScope>),
+    Sequential(Vec<Self>),
     /// Children are mutually exclusive (If branches) — can share base offset.
-    Exclusive(Vec<RegionScope>),
+    Exclusive(Vec<Self>),
     /// A single memory region allocation.
     Leaf { region_id: i64, size_bytes: usize },
 }

crates/ir/src/var_opt.rs

@@ -2212,14 +2212,13 @@ fn dead_store_elim_rec(expr: &RcExpr) -> RcExpr {
                 // Pattern: LetBind("a", 0, LetBind("b", 0, LetBind("c", 0,
                 //   Concat(VarStore("a", val), ...))))
                 // The VarStore for "a" is in the innermost body, invisible to flat scan.
-                forward_through_nested_letbinds(name, &new_init, &new_body)
-                    .unwrap_or_else(|| {
-                        if Rc::ptr_eq(&new_init, init) && Rc::ptr_eq(&new_body, body) {
-                            Rc::clone(expr)
-                        } else {
-                            Rc::new(EvmExpr::LetBind(name.clone(), new_init, new_body))
-                        }
-                    })
+                forward_through_nested_letbinds(name, &new_init, &new_body).unwrap_or_else(|| {
+                    if Rc::ptr_eq(&new_init, init) && Rc::ptr_eq(&new_body, body) {
+                        Rc::clone(expr)
+                    } else {
+                        Rc::new(EvmExpr::LetBind(name.clone(), new_init, new_body))
+                    }
+                })
             } else if Rc::ptr_eq(&new_init, init) && Rc::ptr_eq(&new_body, body) {
                 Rc::clone(expr)
             } else {