Fix regression from #850 (#851)

* fix regression from #850 - it is not always safe to fold added offsets into load/store offsets, as the add wraps but offset does not

* small refactoring to simplify asm2wasm pass invocation

1 files changed, 50 insertions, 20 deletions

diff --git a/test/passes/optimize-instructions.txt b/test/passes/optimize-instructions.txt
index a8cf68dbd..f959c3cd6 100644
--- a/test/passes/optimize-instructions.txt
+++ b/test/passes/optimize-instructions.txt
@@ -415,20 +415,32 @@
     )
   )
   (func $load-off-2 (type $3) (param $0 i32) (result i32)
-    (i32.store
-      (i32.const 6)
+    (i32.store offset=2
+      (i32.add
+        (i32.const 1)
+        (i32.const 3)
+      )
       (get_local $0)
     )
-    (i32.store
-      (i32.const 6)
+    (i32.store offset=2
+      (i32.add
+        (i32.const 3)
+        (i32.const 1)
+      )
       (get_local $0)
     )
-    (i32.store offset=7
-      (get_local $0)
+    (i32.store offset=2
+      (i32.add
+        (get_local $0)
+        (i32.const 5)
+      )
       (get_local $0)
     )
-    (i32.store offset=9
-      (get_local $0)
+    (i32.store offset=2
+      (i32.add
+        (get_local $0)
+        (i32.const 7)
+      )
       (get_local $0)
     )
     (i32.store offset=2
@@ -445,12 +457,18 @@
       )
       (get_local $0)
     )
-    (i32.store
-      (i32.const 4)
+    (i32.store offset=2
+      (i32.add
+        (i32.const -15)
+        (i32.const 17)
+      )
       (get_local $0)
     )
-    (i32.store
-      (i32.const 0)
+    (i32.store offset=2
+      (i32.add
+        (i32.const -21)
+        (i32.const 19)
+      )
       (get_local $0)
     )
     (i32.store
@@ -462,18 +480,27 @@
       (get_local $0)
     )
     (drop
-      (i32.load
-        (i32.const 8)
+      (i32.load offset=2
+        (i32.add
+          (i32.const 2)
+          (i32.const 4)
+        )
       )
     )
     (drop
-      (i32.load
-        (i32.const 8)
+      (i32.load offset=2
+        (i32.add
+          (i32.const 4)
+          (i32.const 2)
+        )
       )
     )
     (drop
-      (i32.load offset=8
-        (get_local $0)
+      (i32.load offset=2
+        (i32.add
+          (get_local $0)
+          (i32.const 6)
+        )
       )
     )
     (drop
@@ -481,8 +508,11 @@
         (i32.const 10)
       )
     )
-    (i32.load offset=12
-      (get_local $0)
+    (i32.load offset=2
+      (i32.add
+        (get_local $0)
+        (i32.const 10)
+      )
     )
   )
 )