allocate __stack_pointer completely

53 files changed, 85 insertions, 83 deletions

diff --git a/src/s2wasm.h b/src/s2wasm.h
index 46cf972c8..8b34d6b03 100644
--- a/src/s2wasm.h
+++ b/src/s2wasm.h
@@ -343,7 +343,9 @@ private:
   }
 
   void prepare() {
-    staticAddresses["__stack_pointer"] = 0; // XXX HACK for now
+    assert(nextStatic == globalBase); // we are the first allocation
+    staticAddresses["__stack_pointer"] = nextStatic;
+    nextStatic += 4;
   }
 
   void process() {
diff --git a/test/dot_s/alternate-lcomm.wast b/test/dot_s/alternate-lcomm.wast
index 075b8d5fd..790a330e5 100644
--- a/test/dot_s/alternate-lcomm.wast
+++ b/test/dot_s/alternate-lcomm.wast
@@ -1,4 +1,4 @@
 (module
-  (memory 5 4294967295)
+  (memory 9 4294967295)
 )
-;; METADATA: { "asmConsts": {},"staticBump": 4 }
+;; METADATA: { "asmConsts": {},"staticBump": 8 }
diff --git a/test/dot_s/data-offset-folding.wast b/test/dot_s/data-offset-folding.wast
index 7a24d7176..11e452667 100644
--- a/test/dot_s/data-offset-folding.wast
+++ b/test/dot_s/data-offset-folding.wast
@@ -1,4 +1,4 @@
 (module
-  (memory 420 4294967295 (segment 4 "\00\00\00\00") (segment 416 "`\00\00\00"))
+  (memory 420 4294967295 (segment 8 "\00\00\00\00") (segment 416 "`\00\00\00"))
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 419 }
diff --git a/test/dot_s/exit.wast b/test/dot_s/exit.wast
index cb54d686b..905a6f226 100644
--- a/test/dot_s/exit.wast
+++ b/test/dot_s/exit.wast
@@ -10,4 +10,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/dot_s/function-data-sections.wast b/test/dot_s/function-data-sections.wast
index 3620f33c6..b2dd9ade4 100644
--- a/test/dot_s/function-data-sections.wast
+++ b/test/dot_s/function-data-sections.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16 4294967295 (segment 4 "\00\00\00\00") (segment 8 "\01\00\00\00") (segment 12 "33\13@"))
+  (memory 20 4294967295 (segment 8 "\00\00\00\00") (segment 12 "\01\00\00\00") (segment 16 "33\13@"))
   (export "foo" $foo)
   (export "bar" $bar)
   (export "qux" $qux)
@@ -32,4 +32,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 15 }
+;; METADATA: { "asmConsts": {},"staticBump": 19 }
diff --git a/test/dot_s/lcomm-in-text-segment.wast b/test/dot_s/lcomm-in-text-segment.wast
index 8bfef7516..9de68cd3c 100644
--- a/test/dot_s/lcomm-in-text-segment.wast
+++ b/test/dot_s/lcomm-in-text-segment.wast
@@ -1,4 +1,4 @@
 (module
-  (memory 16 4294967295 (segment 12 "\05\00\00\00"))
+  (memory 20 4294967295 (segment 16 "\t\00\00\00"))
 )
-;; METADATA: { "asmConsts": {},"staticBump": 15 }
+;; METADATA: { "asmConsts": {},"staticBump": 19 }
diff --git a/test/dot_s/minimal.wast b/test/dot_s/minimal.wast
index 67e714d3f..6a8f3aa6f 100644
--- a/test/dot_s/minimal.wast
+++ b/test/dot_s/minimal.wast
@@ -11,4 +11,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/dot_s/relocation.wast b/test/dot_s/relocation.wast
index a25baee17..a866e19f4 100644
--- a/test/dot_s/relocation.wast
+++ b/test/dot_s/relocation.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 12 4294967295 (segment 4 "\08\00\00\00") (segment 8 "\04\00\00\00"))
+  (memory 16 4294967295 (segment 8 "\0c\00\00\00") (segment 12 "\08\00\00\00"))
   (export "main" $main)
   (func $main (result i32)
     (local $$0 i32)
@@ -7,11 +7,11 @@
       (block
         (br $fake_return_waka123
           (i32.load align=4
-            (i32.const 8)
+            (i32.const 12)
           )
         )
       )
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 11 }
+;; METADATA: { "asmConsts": {},"staticBump": 15 }
diff --git a/test/dot_s/symbolic-offset.wast b/test/dot_s/symbolic-offset.wast
index 5db1a82b0..96237058d 100644
--- a/test/dot_s/symbolic-offset.wast
+++ b/test/dot_s/symbolic-offset.wast
@@ -1,10 +1,10 @@
 (module
-  (memory 16 4294967295 (segment 4 "\01\00\00\00\00\00\00\00\00\00\00\00"))
+  (memory 20 4294967295 (segment 8 "\01\00\00\00\00\00\00\00\00\00\00\00"))
   (export "f" $f)
   (func $f (param $$0 i32) (param $$1 i32)
     (block $fake_return_waka123
       (block
-        (i32.store offset=8 align=4
+        (i32.store offset=12 align=4
           (get_local $$0)
           (get_local $$1)
         )
@@ -13,4 +13,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 15 }
+;; METADATA: { "asmConsts": {},"staticBump": 19 }
diff --git a/test/dot_s/visibilities.wast b/test/dot_s/visibilities.wast
index 261834b58..6b346270e 100644
--- a/test/dot_s/visibilities.wast
+++ b/test/dot_s/visibilities.wast
@@ -25,4 +25,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/call.wast b/test/llvm_autogenerated/call.wast
index 7aa3fa71b..d0e1f6d33 100644
--- a/test/llvm_autogenerated/call.wast
+++ b/test/llvm_autogenerated/call.wast
@@ -141,4 +141,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/cfg-stackify.wast b/test/llvm_autogenerated/cfg-stackify.wast
index f1a2ad63d..be0cb88d6 100644
--- a/test/llvm_autogenerated/cfg-stackify.wast
+++ b/test/llvm_autogenerated/cfg-stackify.wast
@@ -1150,4 +1150,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/comparisons_f32.wast b/test/llvm_autogenerated/comparisons_f32.wast
index 6a050b39f..97f4aeea9 100644
--- a/test/llvm_autogenerated/comparisons_f32.wast
+++ b/test/llvm_autogenerated/comparisons_f32.wast
@@ -267,4 +267,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/comparisons_f64.wast b/test/llvm_autogenerated/comparisons_f64.wast
index 29fb60481..69658d3e3 100644
--- a/test/llvm_autogenerated/comparisons_f64.wast
+++ b/test/llvm_autogenerated/comparisons_f64.wast
@@ -267,4 +267,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/comparisons_i32.wast b/test/llvm_autogenerated/comparisons_i32.wast
index 65fc3bad2..063aad1cd 100644
--- a/test/llvm_autogenerated/comparisons_i32.wast
+++ b/test/llvm_autogenerated/comparisons_i32.wast
@@ -131,4 +131,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/comparisons_i64.wast b/test/llvm_autogenerated/comparisons_i64.wast
index 63166a543..dc0b18f34 100644
--- a/test/llvm_autogenerated/comparisons_i64.wast
+++ b/test/llvm_autogenerated/comparisons_i64.wast
@@ -131,4 +131,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/conv.wast b/test/llvm_autogenerated/conv.wast
index f0a6097dc..266f72c4f 100644
--- a/test/llvm_autogenerated/conv.wast
+++ b/test/llvm_autogenerated/conv.wast
@@ -316,4 +316,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/copysign-casts.wast b/test/llvm_autogenerated/copysign-casts.wast
index 0bee77732..29dc45983 100644
--- a/test/llvm_autogenerated/copysign-casts.wast
+++ b/test/llvm_autogenerated/copysign-casts.wast
@@ -31,4 +31,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/cpus.wast b/test/llvm_autogenerated/cpus.wast
index 736a887bd..a93c9ebe8 100644
--- a/test/llvm_autogenerated/cpus.wast
+++ b/test/llvm_autogenerated/cpus.wast
@@ -11,4 +11,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/dead-vreg.wast b/test/llvm_autogenerated/dead-vreg.wast
index f99ee925a..c0099f7f6 100644
--- a/test/llvm_autogenerated/dead-vreg.wast
+++ b/test/llvm_autogenerated/dead-vreg.wast
@@ -111,4 +111,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/f32.wast b/test/llvm_autogenerated/f32.wast
index a6ca50b42..38b7e2eb3 100644
--- a/test/llvm_autogenerated/f32.wast
+++ b/test/llvm_autogenerated/f32.wast
@@ -204,4 +204,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/f64.wast b/test/llvm_autogenerated/f64.wast
index 665e02c76..33b0faa6f 100644
--- a/test/llvm_autogenerated/f64.wast
+++ b/test/llvm_autogenerated/f64.wast
@@ -204,4 +204,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/fast-isel.wast b/test/llvm_autogenerated/fast-isel.wast
index a172ea5e2..00b4e93fd 100644
--- a/test/llvm_autogenerated/fast-isel.wast
+++ b/test/llvm_autogenerated/fast-isel.wast
@@ -21,4 +21,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/frem.wast b/test/llvm_autogenerated/frem.wast
index 6e300a646..21d14d9e9 100644
--- a/test/llvm_autogenerated/frem.wast
+++ b/test/llvm_autogenerated/frem.wast
@@ -31,4 +31,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/func.wast b/test/llvm_autogenerated/func.wast
index 9523359bf..ae815c2e5 100644
--- a/test/llvm_autogenerated/func.wast
+++ b/test/llvm_autogenerated/func.wast
@@ -70,4 +70,4 @@
     (unreachable)
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/global.wast b/test/llvm_autogenerated/global.wast
index 075f6b4f9..6569b8376 100644
--- a/test/llvm_autogenerated/global.wast
+++ b/test/llvm_autogenerated/global.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 1184 4294967295 (segment 4 "9\05\00\00") (segment 20 "\01\00\00\00") (segment 24 "*\00\00\00") (segment 28 "\ff\ff\ff\ff") (segment 56 "\00\00\00\00\01\00\00\00") (segment 64 "\ff\ff\ff\ff\ff\ff\ff\ff") (segment 84 "\00\00\00\80") (segment 88 "\00\00\00@") (segment 120 "\00\00\00\00\00\00\00\80") (segment 128 "\00\00\00\00\00\00\00@") (segment 656 "\e0\00\00\00"))
+  (memory 1184 4294967295 (segment 8 "9\05\00\00") (segment 24 "\01\00\00\00") (segment 28 "*\00\00\00") (segment 32 "\ff\ff\ff\ff") (segment 64 "\00\00\00\00\01\00\00\00") (segment 72 "\ff\ff\ff\ff\ff\ff\ff\ff") (segment 92 "\00\00\00\80") (segment 96 "\00\00\00@") (segment 128 "\00\00\00\00\00\00\00\80") (segment 136 "\00\00\00\00\00\00\00@") (segment 656 "\e0\00\00\00"))
   (type $FUNCSIG$viii (func (param i32 i32 i32)))
   (import $memcpy "env" "memcpy" (param i32 i32 i32))
   (export "foo" $foo)
@@ -8,7 +8,7 @@
     (block $fake_return_waka123
       (block
         (br $fake_return_waka123
-          (i32.load offset=24 align=4
+          (i32.load offset=28 align=4
             (i32.const 0)
           )
         )
diff --git a/test/llvm_autogenerated/globl.wast b/test/llvm_autogenerated/globl.wast
index b36657b8f..d9abf5ebc 100644
--- a/test/llvm_autogenerated/globl.wast
+++ b/test/llvm_autogenerated/globl.wast
@@ -9,4 +9,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/i32.wast b/test/llvm_autogenerated/i32.wast
index 7466c5b6c..7cbe54970 100644
--- a/test/llvm_autogenerated/i32.wast
+++ b/test/llvm_autogenerated/i32.wast
@@ -230,4 +230,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/i64.wast b/test/llvm_autogenerated/i64.wast
index d193b2cb5..5007bb578 100644
--- a/test/llvm_autogenerated/i64.wast
+++ b/test/llvm_autogenerated/i64.wast
@@ -230,4 +230,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/ident.wast b/test/llvm_autogenerated/ident.wast
index 955ce11ea..62e304e84 100644
--- a/test/llvm_autogenerated/ident.wast
+++ b/test/llvm_autogenerated/ident.wast
@@ -1,4 +1,4 @@
 (module
   (memory 0 4294967295)
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/immediates.wast b/test/llvm_autogenerated/immediates.wast
index 61d6427ba..85763fe54 100644
--- a/test/llvm_autogenerated/immediates.wast
+++ b/test/llvm_autogenerated/immediates.wast
@@ -241,4 +241,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/legalize.wast b/test/llvm_autogenerated/legalize.wast
index c05d5bf1f..6a6c87461 100644
--- a/test/llvm_autogenerated/legalize.wast
+++ b/test/llvm_autogenerated/legalize.wast
@@ -368,7 +368,7 @@
     (block $fake_return_waka123
       (block
         (set_local $$181
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$181
           (i32.load align=4
@@ -385,7 +385,7 @@
           )
         )
         (set_local $$182
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$279
           (i32.store align=4
@@ -3960,7 +3960,7 @@
           )
         )
         (set_local $$183
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$279
           (i32.store align=4
@@ -3973,4 +3973,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/load-ext.wast b/test/llvm_autogenerated/load-ext.wast
index 422828010..7c54d6cec 100644
--- a/test/llvm_autogenerated/load-ext.wast
+++ b/test/llvm_autogenerated/load-ext.wast
@@ -121,4 +121,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/load-store-i1.wast b/test/llvm_autogenerated/load-store-i1.wast
index d9b67382b..863384950 100644
--- a/test/llvm_autogenerated/load-store-i1.wast
+++ b/test/llvm_autogenerated/load-store-i1.wast
@@ -99,4 +99,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/load.wast b/test/llvm_autogenerated/load.wast
index ac52dcda0..4ed4e2ae3 100644
--- a/test/llvm_autogenerated/load.wast
+++ b/test/llvm_autogenerated/load.wast
@@ -49,4 +49,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/memory-addr32.wast b/test/llvm_autogenerated/memory-addr32.wast
index c056c10d9..12d843ead 100644
--- a/test/llvm_autogenerated/memory-addr32.wast
+++ b/test/llvm_autogenerated/memory-addr32.wast
@@ -20,4 +20,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/memory-addr64.wast b/test/llvm_autogenerated/memory-addr64.wast
index 49c56ea9b..64201e3d6 100644
--- a/test/llvm_autogenerated/memory-addr64.wast
+++ b/test/llvm_autogenerated/memory-addr64.wast
@@ -20,4 +20,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/offset-folding.wast b/test/llvm_autogenerated/offset-folding.wast
index b3a247cc1..32680aad3 100644
--- a/test/llvm_autogenerated/offset-folding.wast
+++ b/test/llvm_autogenerated/offset-folding.wast
@@ -8,7 +8,7 @@
     (block $fake_return_waka123
       (block
         (br $fake_return_waka123
-          (i32.const 192)
+          (i32.const 196)
         )
       )
     )
@@ -26,7 +26,7 @@
     (block $fake_return_waka123
       (block
         (br $fake_return_waka123
-          (i32.const 4)
+          (i32.const 8)
         )
       )
     )
diff --git a/test/llvm_autogenerated/offset.wast b/test/llvm_autogenerated/offset.wast
index d85361666..5dea41ca3 100644
--- a/test/llvm_autogenerated/offset.wast
+++ b/test/llvm_autogenerated/offset.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 8 4294967295 (segment 4 "\00\00\00\00"))
+  (memory 12 4294967295 (segment 8 "\00\00\00\00"))
   (export "load_i32_with_folded_offset" $load_i32_with_folded_offset)
   (export "load_i32_with_folded_gep_offset" $load_i32_with_folded_gep_offset)
   (export "load_i32_with_unfolded_gep_negative_offset" $load_i32_with_unfolded_gep_negative_offset)
@@ -303,7 +303,7 @@
     (block $fake_return_waka123
       (block
         (br $fake_return_waka123
-          (i32.load offset=4 align=4
+          (i32.load offset=8 align=4
             (i32.const 0)
           )
         )
@@ -332,7 +332,7 @@
         (set_local $$0
           (i32.const 0)
         )
-        (i32.store offset=4 align=4
+        (i32.store offset=8 align=4
           (get_local $$0)
           (get_local $$0)
         )
@@ -470,4 +470,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 7 }
+;; METADATA: { "asmConsts": {},"staticBump": 11 }
diff --git a/test/llvm_autogenerated/phi.wast b/test/llvm_autogenerated/phi.wast
index 301f1a670..381351ad1 100644
--- a/test/llvm_autogenerated/phi.wast
+++ b/test/llvm_autogenerated/phi.wast
@@ -79,4 +79,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/reg-stackify.wast b/test/llvm_autogenerated/reg-stackify.wast
index 75dc7291e..2952ef1be 100644
--- a/test/llvm_autogenerated/reg-stackify.wast
+++ b/test/llvm_autogenerated/reg-stackify.wast
@@ -152,4 +152,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/return-int32.wast b/test/llvm_autogenerated/return-int32.wast
index 57bf9538b..928df5279 100644
--- a/test/llvm_autogenerated/return-int32.wast
+++ b/test/llvm_autogenerated/return-int32.wast
@@ -11,4 +11,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/return-void.wast b/test/llvm_autogenerated/return-void.wast
index 8cfa247b0..191019f9a 100644
--- a/test/llvm_autogenerated/return-void.wast
+++ b/test/llvm_autogenerated/return-void.wast
@@ -9,4 +9,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/select.wast b/test/llvm_autogenerated/select.wast
index bb5a4e575..507a3ca99 100644
--- a/test/llvm_autogenerated/select.wast
+++ b/test/llvm_autogenerated/select.wast
@@ -169,4 +169,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/signext-zeroext.wast b/test/llvm_autogenerated/signext-zeroext.wast
index 480223851..2344c33be 100644
--- a/test/llvm_autogenerated/signext-zeroext.wast
+++ b/test/llvm_autogenerated/signext-zeroext.wast
@@ -77,4 +77,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/store-results.wast b/test/llvm_autogenerated/store-results.wast
index 34639a9d1..b03ccee65 100644
--- a/test/llvm_autogenerated/store-results.wast
+++ b/test/llvm_autogenerated/store-results.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16 4294967295)
+  (memory 20 4294967295)
   (export "single_block" $single_block)
   (export "foo" $foo)
   (export "bar" $bar)
@@ -34,7 +34,7 @@
                 (i32.const 1)
               )
             )
-            (i32.store offset=4 align=4
+            (i32.store offset=8 align=4
               (get_local $$0)
               (get_local $$0)
             )
@@ -64,7 +64,7 @@
         )
         (loop $label$1 $label$0
           (block
-            (i32.store offset=4 align=4
+            (i32.store offset=8 align=4
               (get_local $$0)
               (get_local $$0)
             )
@@ -88,4 +88,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 15 }
+;; METADATA: { "asmConsts": {},"staticBump": 19 }
diff --git a/test/llvm_autogenerated/store-trunc.wast b/test/llvm_autogenerated/store-trunc.wast
index 44b400534..9f09363d9 100644
--- a/test/llvm_autogenerated/store-trunc.wast
+++ b/test/llvm_autogenerated/store-trunc.wast
@@ -61,4 +61,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/store.wast b/test/llvm_autogenerated/store.wast
index d3a89a131..2f16fb037 100644
--- a/test/llvm_autogenerated/store.wast
+++ b/test/llvm_autogenerated/store.wast
@@ -49,4 +49,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/switch.wast b/test/llvm_autogenerated/switch.wast
index 098445ef7..ad24c7987 100644
--- a/test/llvm_autogenerated/switch.wast
+++ b/test/llvm_autogenerated/switch.wast
@@ -98,4 +98,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/unreachable.wast b/test/llvm_autogenerated/unreachable.wast
index 592132990..0dac9c8cc 100644
--- a/test/llvm_autogenerated/unreachable.wast
+++ b/test/llvm_autogenerated/unreachable.wast
@@ -26,4 +26,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/unused-argument.wast b/test/llvm_autogenerated/unused-argument.wast
index 226ff8ef5..acea3edad 100644
--- a/test/llvm_autogenerated/unused-argument.wast
+++ b/test/llvm_autogenerated/unused-argument.wast
@@ -32,4 +32,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/userstack.wast b/test/llvm_autogenerated/userstack.wast
index d412410f3..c0e032e93 100644
--- a/test/llvm_autogenerated/userstack.wast
+++ b/test/llvm_autogenerated/userstack.wast
@@ -13,7 +13,7 @@
     (block $fake_return_waka123
       (block
         (set_local $$0
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$0
           (i32.load align=4
@@ -30,7 +30,7 @@
           )
         )
         (set_local $$1
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$3
           (i32.store align=4
@@ -52,7 +52,7 @@
           )
         )
         (set_local $$2
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$3
           (i32.store align=4
@@ -72,7 +72,7 @@
     (block $fake_return_waka123
       (block
         (set_local $$0
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$0
           (i32.load align=4
@@ -89,7 +89,7 @@
           )
         )
         (set_local $$1
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$3
           (i32.store align=4
@@ -115,7 +115,7 @@
           )
         )
         (set_local $$2
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$3
           (i32.store align=4
@@ -137,7 +137,7 @@
     (block $fake_return_waka123
       (block
         (set_local $$1
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$1
           (i32.load align=4
@@ -154,7 +154,7 @@
           )
         )
         (set_local $$2
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$5
           (i32.store align=4
@@ -194,7 +194,7 @@
           )
         )
         (set_local $$3
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$5
           (i32.store align=4
@@ -214,7 +214,7 @@
     (block $fake_return_waka123
       (block
         (set_local $$0
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$0
           (i32.load align=4
@@ -231,7 +231,7 @@
           )
         )
         (set_local $$1
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$3
           (i32.store align=4
@@ -256,7 +256,7 @@
           )
         )
         (set_local $$2
-          (i32.const 0)
+          (i32.const 1)
         )
         (set_local $$3
           (i32.store align=4
@@ -276,4 +276,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }
diff --git a/test/llvm_autogenerated/varargs.wast b/test/llvm_autogenerated/varargs.wast
index 01a9a49ea..aaa15d36c 100644
--- a/test/llvm_autogenerated/varargs.wast
+++ b/test/llvm_autogenerated/varargs.wast
@@ -158,4 +158,4 @@
     )
   )
 )
-;; METADATA: { "asmConsts": {},"staticBump": 0 }
+;; METADATA: { "asmConsts": {},"staticBump": 4 }