Reject all nonexistent instructions in sexp format (#1756)

5 files changed, 6 insertions, 10 deletions

diff --git a/test/passes/flatten_simplify-locals-nonesting_souperify-single-use.wast b/test/passes/flatten_simplify-locals-nonesting_souperify-single-use.wast
index 92941ca4c..3d389cfdb 100644
--- a/test/passes/flatten_simplify-locals-nonesting_souperify-single-use.wast
+++ b/test/passes/flatten_simplify-locals-nonesting_souperify-single-use.wast
@@ -948,7 +948,7 @@
   (func $multi-use-2 (param $x i32) (result i32)
     (local $temp i32)
     (set_local $temp (i32.add (get_local $x) (i32.const 1)))
-    (set_local $x (i32.mul (get-local $temp) (i32.const 2)))
+    (set_local $x (i32.mul (get_local $temp) (i32.const 2)))
     (i32.sub (get_local $x) (get_local $temp))
   )
   (func $many-single-uses-with-param (param $x i32) (result i32)
@@ -1245,4 +1245,3 @@
   (unreachable)
  )
 )
-
diff --git a/test/passes/flatten_simplify-locals-nonesting_souperify.wast b/test/passes/flatten_simplify-locals-nonesting_souperify.wast
index 468af153b..8c77b287b 100644
--- a/test/passes/flatten_simplify-locals-nonesting_souperify.wast
+++ b/test/passes/flatten_simplify-locals-nonesting_souperify.wast
@@ -955,7 +955,7 @@
   (func $multi-use-2 (param $x i32) (result i32)
     (local $temp i32)
     (set_local $temp (i32.add (get_local $x) (i32.const 1)))
-    (set_local $x (i32.mul (get-local $temp) (i32.const 2)))
+    (set_local $x (i32.mul (get_local $temp) (i32.const 2)))
     (i32.sub (get_local $x) (get_local $temp))
   )
   (func $many-single-uses-with-param (param $x i32) (result i32)
@@ -1252,4 +1252,3 @@
   (unreachable)
  )
 )
-
diff --git a/test/passes/instrument-memory.wast b/test/passes/instrument-memory.wast
index 7f92de9cd..2dddd8405 100644
--- a/test/passes/instrument-memory.wast
+++ b/test/passes/instrument-memory.wast
@@ -39,7 +39,7 @@
     (i32.store (i32.const 0) (i32.const 3))
     (i64.store8 (i32.const 0) (i64.const 4))
     (i64.store16 (i32.const 0) (i64.const 5))
-    (i64.store326 (i32.const 0) (i64.const 6))
+    (i64.store32 (i32.const 0) (i64.const 6))
     (i64.store (i32.const 0) (i64.const 7))
     (f32.store (i32.const 0) (f32.const 8))
     (f64.store (i32.const 0) (f64.const 9))
@@ -55,4 +55,3 @@
     (f64.store align=2 offset=9 (i32.const 0) (f64.const 9))
   )
 )
-
diff --git a/test/passes/optimize-instructions.wast b/test/passes/optimize-instructions.wast
index 53ed761d8..9ab5127a3 100644
--- a/test/passes/optimize-instructions.wast
+++ b/test/passes/optimize-instructions.wast
@@ -615,7 +615,7 @@
     (drop
       (i32.shr_s
         (i32.shl
-          (get-local $0) ;; who knows...
+          (get_local $0) ;; who knows...
           (i32.const 24)
         )
         (i32.const 24)
@@ -3571,4 +3571,3 @@
    )
   )
 )
-
diff --git a/test/wasm2js/reinterpret.wast b/test/wasm2js/reinterpret.wast
index 816fb90a3..d1431b368 100644
--- a/test/wasm2js/reinterpret.wast
+++ b/test/wasm2js/reinterpret.wast
@@ -2,9 +2,9 @@
   (func $dummy)
 
   (func (export "i32_roundtrip") (param $0 i32) (result i32)
-    (i32.eq (i32.reinterpret (f32.reinterpret (get_local $0))) (get_local $0)))
+    (i32.eq (i32.reinterpret/f32 (f32.reinterpret/i32 (get_local $0))) (get_local $0)))
   (func (export "i64_roundtrip") (param $0 i64) (result i32)
-    (i64.eq (i64.reinterpret (f64.reinterpret (get_local $0))) (get_local $0)))
+    (i64.eq (i64.reinterpret/f64 (f64.reinterpret/i64 (get_local $0))) (get_local $0)))
 )
 
 (assert_return (invoke "i32_roundtrip" (i32.const 0))