1 files changed, 56 insertions, 67 deletions
diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm
index 5afec926b..8c400ab68 100644
--- a/test/memorygrowth.fromasm
+++ b/test/memorygrowth.fromasm
@@ -8532,16 +8532,15 @@
    )
   )
  )
- (func $ab (; 19 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
+ (func $ab (; 19 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+  (local $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
-  (local $8 i32)
-  (local $9 i32)
-  (set_local $5
+  (set_local $4
    (get_global $r)
   )
   (set_global $r
@@ -8551,20 +8550,15 @@
    )
   )
   (i32.store8
-   (tee_local $6
-    (get_local $5)
-   )
-   (tee_local $9
-    (i32.and
-     (get_local $1)
-     (i32.const 255)
-    )
+   (tee_local $5
+    (get_local $4)
    )
+   (i32.const 10)
   )
   (if
-   (tee_local $3
+   (tee_local $2
     (i32.load
-     (tee_local $2
+     (tee_local $1
       (i32.add
        (get_local $0)
        (i32.const 16)
@@ -8573,10 +8567,10 @@
     )
    )
    (block
-    (set_local $7
-     (get_local $3)
+    (set_local $6
+     (get_local $2)
     )
-    (set_local $8
+    (set_local $7
      (i32.const 4)
     )
    )
@@ -8584,16 +8578,16 @@
     (call $Xa
      (get_local $0)
     )
-    (set_local $4
+    (set_local $3
      (i32.const -1)
     )
     (block
-     (set_local $7
+     (set_local $6
       (i32.load
-       (get_local $2)
+       (get_local $1)
       )
      )
-     (set_local $8
+     (set_local $7
       (i32.const 4)
      )
     )
@@ -8602,15 +8596,15 @@
   (block $do-once
    (if
     (i32.eq
-     (get_local $8)
+     (get_local $7)
      (i32.const 4)
     )
     (block
      (if
       (i32.lt_u
-       (tee_local $2
+       (tee_local $1
         (i32.load
-         (tee_local $3
+         (tee_local $2
           (i32.add
            (get_local $0)
            (i32.const 20)
@@ -8618,15 +8612,12 @@
          )
         )
        )
-       (get_local $7)
+       (get_local $6)
       )
       (if
        (i32.ne
-        (tee_local $4
-         (i32.and
-          (get_local $1)
-          (i32.const 255)
-         )
+        (tee_local $3
+         (i32.const 10)
         )
         (i32.load8_s offset=75
          (get_local $0)
@@ -8634,26 +8625,26 @@
        )
        (block
         (i32.store
-         (get_local $3)
+         (get_local $2)
          (i32.add
-          (get_local $2)
+          (get_local $1)
           (i32.const 1)
          )
         )
         (i32.store8
-         (get_local $2)
-         (get_local $9)
+         (get_local $1)
+         (i32.const 10)
         )
         (br $do-once)
        )
       )
      )
-     (set_local $4
+     (set_local $3
       (if (result i32)
        (i32.eq
         (call_indirect (type $FUNCSIG$iiii)
          (get_local $0)
-         (get_local $6)
+         (get_local $5)
          (i32.const 1)
          (i32.add
           (i32.and
@@ -8668,7 +8659,7 @@
         (i32.const 1)
        )
        (i32.load8_u
-        (get_local $6)
+        (get_local $5)
        )
        (i32.const -1)
       )
@@ -8677,9 +8668,9 @@
    )
   )
   (set_global $r
-   (get_local $5)
+   (get_local $4)
   )
-  (get_local $4)
+  (get_local $3)
  )
  (func $$a (; 20 ;) (; has Stack IR ;) (param $0 i32) (result i32)
   (local $1 i32)
@@ -9104,12 +9095,13 @@
    (get_local $2)
   )
  )
- (func $db (; 24 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $db (; 24 ;) (; has Stack IR ;) (result i32)
+  (local $0 i32)
   (local $1 i32)
   (local $2 i32)
   (drop
    (i32.load offset=76
-    (tee_local $1
+    (tee_local $0
      (i32.load
       (i32.const 1024)
      )
@@ -9118,18 +9110,17 @@
   )
   (i32.shr_s
    (i32.shl
-    (tee_local $0
+    (tee_local $1
      (block $do-once (result i32)
       (if (result i32)
        (i32.lt_s
         (i32.add
          (call $bb
-          (get_local $0)
+          (i32.const 1144)
           (call $Za
-           (get_local $0)
+           (i32.const 1144)
           )
-          (i32.const 1)
-          (get_local $1)
+          (get_local $0)
          )
          (i32.const -1)
         )
@@ -9140,36 +9131,36 @@
         (if
          (i32.ne
           (i32.load8_s offset=75
-           (get_local $1)
+           (get_local $0)
           )
           (i32.const 10)
          )
          (if
           (i32.lt_u
-           (tee_local $0
+           (tee_local $1
             (i32.load
              (tee_local $2
               (i32.add
-               (get_local $1)
+               (get_local $0)
                (i32.const 20)
               )
              )
             )
            )
            (i32.load offset=16
-            (get_local $1)
+            (get_local $0)
            )
           )
           (block
            (i32.store
             (get_local $2)
             (i32.add
-             (get_local $0)
+             (get_local $1)
              (i32.const 1)
             )
            )
            (i32.store8
-            (get_local $0)
+            (get_local $1)
             (i32.const 10)
            )
            (br $do-once
@@ -9180,8 +9171,7 @@
         )
         (i32.lt_s
          (call $ab
-          (get_local $1)
-          (i32.const 10)
+          (get_local $0)
          )
          (i32.const 0)
         )
@@ -9272,33 +9262,34 @@
    )
   )
  )
- (func $bb (; 26 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $bb (; 26 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
   (local $4 i32)
   (set_local $4
-   (i32.mul
-    (get_local $2)
-    (get_local $1)
-   )
+   (i32.const 1)
+  )
+  (set_local $3
+   (get_local $1)
   )
   (if
    (block (result i32)
     (drop
      (i32.load offset=76
-      (get_local $3)
+      (get_local $2)
      )
     )
     (i32.ne
      (tee_local $0
       (call $Wa
        (get_local $0)
-       (get_local $4)
        (get_local $3)
+       (get_local $2)
       )
      )
-     (get_local $4)
+     (get_local $3)
     )
    )
-   (set_local $2
+   (set_local $4
     (if (result i32)
      (get_local $1)
      (i32.div_u
@@ -9309,7 +9300,7 @@
     )
    )
   )
-  (get_local $2)
+  (get_local $4)
  )
  (func $Ua (; 27 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
@@ -9611,9 +9602,7 @@
  )
  (func $Na (; 41 ;) (; has Stack IR ;) (result i32)
   (drop
-   (call $db
-    (i32.const 1144)
-   )
+   (call $db)
   )
   (i32.const 0)
  )