Fix incorrect wat in tests (#6207)

The new wat parser is much more strict than the legacy wat parser; the latter
accepts all sorts of things that the spec does not allow. To ease an eventual
transition to using the new wat parser by default, update the tests to use the
standard text format in many places where they previously did not. We do not yet
have a way to prevent new errors from being introduced into the test suite, but
at least there will now be many fewer errors when it comes time to make the
switch.

15 files changed, 101 insertions, 103 deletions

diff --git a/test/passes/Oz_fuzz-exec_all-features.wast b/test/passes/Oz_fuzz-exec_all-features.wast
index 1d2b106b7..3893ddccd 100644
--- a/test/passes/Oz_fuzz-exec_all-features.wast
+++ b/test/passes/Oz_fuzz-exec_all-features.wast
@@ -79,7 +79,7 @@
    (struct.new_default $struct)
   )
   (drop
-   (block $block (result ($ref $struct))
+   (block $block (result (ref $struct))
     (drop
      (block $extendedblock (result (ref $extendedstruct))
       (drop
@@ -348,7 +348,7 @@
    (struct.new_default $struct)
   )
   (drop
-   (block $block (result ($ref $struct))
+   (block $block (result (ref $struct))
     (drop
      (block $extendedblock (result (ref $extendedstruct))
       (drop
diff --git a/test/passes/duplicate-function-elimination_optimize-level=1.wast b/test/passes/duplicate-function-elimination_optimize-level=1.wast
index 5b42a6ba5..1097f6715 100644
--- a/test/passes/duplicate-function-elimination_optimize-level=1.wast
+++ b/test/passes/duplicate-function-elimination_optimize-level=1.wast
@@ -52,8 +52,8 @@
   (memory 0)
   (start $other)
   (type $0 (func))
-  (export "keep2" $keep2)
-  (export "other" $other)
+  (export "keep2" (func $keep2))
+  (export "other" (func $other))
   (table 3 3 funcref)
   (elem (i32.const 0) $keep2 $other $caller)
   (func $keep2 (type $0)
@@ -437,8 +437,8 @@
 (module
   (memory 0)
   (type $FUNCSIG$v (func))
-  (import $i "env" "i")
-  (import $j "env" "j")
+  (import "env" "i" (func $i))
+  (import "env" "j" (func $j))
   (func $erase (type $FUNCSIG$v)
     (call $i)
   )
@@ -449,8 +449,8 @@
 (module
   (memory 0)
   (type $FUNCSIG$v (func))
-  (import $i "env" "i")
-  (import $j "env" "j")
+  (import "env" "i" (func $i))
+  (import "env" "j" (func $j))
   (func $keep2 (type $FUNCSIG$v)
     (call $i)
   )
diff --git a/test/passes/duplicate-function-elimination_optimize-level=2.wast b/test/passes/duplicate-function-elimination_optimize-level=2.wast
index 5b42a6ba5..1097f6715 100644
--- a/test/passes/duplicate-function-elimination_optimize-level=2.wast
+++ b/test/passes/duplicate-function-elimination_optimize-level=2.wast
@@ -52,8 +52,8 @@
   (memory 0)
   (start $other)
   (type $0 (func))
-  (export "keep2" $keep2)
-  (export "other" $other)
+  (export "keep2" (func $keep2))
+  (export "other" (func $other))
   (table 3 3 funcref)
   (elem (i32.const 0) $keep2 $other $caller)
   (func $keep2 (type $0)
@@ -437,8 +437,8 @@
 (module
   (memory 0)
   (type $FUNCSIG$v (func))
-  (import $i "env" "i")
-  (import $j "env" "j")
+  (import "env" "i" (func $i))
+  (import "env" "j" (func $j))
   (func $erase (type $FUNCSIG$v)
     (call $i)
   )
@@ -449,8 +449,8 @@
 (module
   (memory 0)
   (type $FUNCSIG$v (func))
-  (import $i "env" "i")
-  (import $j "env" "j")
+  (import "env" "i" (func $i))
+  (import "env" "j" (func $j))
   (func $keep2 (type $FUNCSIG$v)
     (call $i)
   )
diff --git a/test/passes/fuzz-exec_all-features.wast b/test/passes/fuzz-exec_all-features.wast
index bab6afb79..9250ad3ec 100644
--- a/test/passes/fuzz-exec_all-features.wast
+++ b/test/passes/fuzz-exec_all-features.wast
@@ -36,13 +36,11 @@
  (func $unaligned_load (export "unaligned_load") (result i32)
   (i32.atomic.load
    (i32.const 1) ;; unaligned ptr
-   (i32.const 1)
   )
  )
  (func $unaligned_load_offset (export "unaligned_load_offset") (result i32)
   (i32.atomic.load offset=1 ;; unaligned with offset
    (i32.const 0)
-   (i32.const 1)
   )
  )
  (func $aligned_for_size (export "aligned_for_size") (result i32)
diff --git a/test/passes/merge-locals_all-features.wast b/test/passes/merge-locals_all-features.wast
index b1d3aa9b7..0eff2bcb7 100644
--- a/test/passes/merge-locals_all-features.wast
+++ b/test/passes/merge-locals_all-features.wast
@@ -1,6 +1,6 @@
 (module
  (global $global$0 (mut i32) (i32.const 10))
- (func $test (param $x $i32) (param $y i32) (result i32)
+ (func $test (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -16,7 +16,7 @@
   )
   (local.get $y) ;; turn this into $x
  )
- (func $test2 (param $x $i32) (param $y i32) (result i32)
+ (func $test2 (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -32,7 +32,7 @@
   )
   (local.get $x)
  )
- (func $test-multiple (param $x $i32) (param $y i32) (result i32)
+ (func $test-multiple (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -49,7 +49,7 @@
   (drop (local.get $y)) ;; turn this into $x
   (local.get $y) ;; turn this into $x
  )
- (func $test-just-some (param $x $i32) (param $y i32) (result i32)
+ (func $test-just-some (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -67,7 +67,7 @@
   (local.set $y (i32.const 200))
   (local.get $y) ;; but not this one!
  )
- (func $test-just-some2 (param $x $i32) (param $y i32) (result i32)
+ (func $test-just-some2 (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -92,7 +92,7 @@
   )
   (i32.const 500)
  )
- (func $test-just-some3 (param $x $i32) (param $y i32) (result i32)
+ (func $test-just-some3 (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -117,7 +117,7 @@
   )
   (local.get $y) ;; but not this one!
  )
- (func $silly-self (param $x $i32) (param $y i32) (result i32)
+ (func $silly-self (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -133,7 +133,7 @@
   )
   (local.get $y) ;; turn this into $x
  )
- (func $silly-multi (param $x $i32) (param $y i32) (result i32)
+ (func $silly-multi (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -179,7 +179,7 @@
    (local.get $var$1) ;; can't be changed to $var$2, as it changes
   )
  )
- (func $reverse (param $x $i32) (param $y i32)
+ (func $reverse (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -201,7 +201,7 @@
   )
   (drop (local.get $y)) ;; cannot this into $x, since this $y has multiple sources
  )
- (func $reverse-end (param $x $i32) (param $y i32)
+ (func $reverse-end (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -216,7 +216,7 @@
    )
   )
  )
- (func $reverse-lone-end-2 (param $x $i32) (param $y i32)
+ (func $reverse-lone-end-2 (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -233,7 +233,7 @@
   (local.set $y (i32.const 200))
   (drop (local.get $y)) ;; cannot this into $x, since this $y has multiple sources
  )
- (func $reverse-undo (param $x $i32) (param $y i32)
+ (func $reverse-undo (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -256,7 +256,7 @@
   )
   (drop (local.get $y)) ;; cannot this into $x, since this $y has multiple sources
  )
- (func $reverse-undo2 (param $x $i32) (param $y i32)
+ (func $reverse-undo2 (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -279,7 +279,7 @@
   )
   (drop (local.get $y)) ;; cannot this into $x, since this $y has multiple sources
  )
- (func $reverse-undo3-conditional (param $x $i32) (param $y i32)
+ (func $reverse-undo3-conditional (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -306,7 +306,7 @@
   )
   (drop (local.get $y)) ;; cannot this into $x, since this $y has multiple sources
  )
- (func $reverse-undo3-conditional-b (param $x $i32) (param $y i32)
+ (func $reverse-undo3-conditional-b (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -333,7 +333,7 @@
   )
   (drop (local.get $y)) ;; cannot this into $x, since this $y has multiple sources
  )
- (func $reverse-undo3-conditional-c (param $x $i32) (param $y i32)
+ (func $reverse-undo3-conditional-c (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
diff --git a/test/passes/optimize-instructions_fuzz-exec.wast b/test/passes/optimize-instructions_fuzz-exec.wast
index f047e3ac2..927ca5c06 100644
--- a/test/passes/optimize-instructions_fuzz-exec.wast
+++ b/test/passes/optimize-instructions_fuzz-exec.wast
@@ -4,57 +4,57 @@
  (func $test32 (export "test32")
   (call $logf32
    (f32.add
-    (f32.const -nan:0xffff82)
+    (f32.const -nan:0x7fff82)
     (f32.neg
-     (f32.const -nan:0xfff622)
+     (f32.const -nan:0x7ff622)
     )
    )
   )
   (call $logf32
    (f32.sub
-    (f32.const -nan:0xffff82)
+    (f32.const -nan:0x7fff82)
     (f32.neg
-     (f32.const -nan:0xfff622)
+     (f32.const -nan:0x7ff622)
     )
    )
   )
   (call $logf32
    (f32.mul
-    (f32.const -nan:0xffff82)
+    (f32.const -nan:0x7fff82)
     (f32.neg
-     (f32.const -nan:0xfff622)
+     (f32.const -nan:0x7ff622)
     )
    )
   )
   (call $logf32
    (f32.div
-    (f32.const -nan:0xffff82)
+    (f32.const -nan:0x7fff82)
     (f32.neg
-     (f32.const -nan:0xfff622)
+     (f32.const -nan:0x7ff622)
     )
    )
   )
   (call $logf32
    (f32.copysign
-    (f32.const -nan:0xffff82)
+    (f32.const -nan:0x7fff82)
     (f32.neg
-     (f32.const -nan:0xfff622)
+     (f32.const -nan:0x7ff622)
     )
    )
   )
   (call $logf32
    (f32.min
-    (f32.const -nan:0xffff82)
+    (f32.const -nan:0x7fff82)
     (f32.neg
-     (f32.const -nan:0xfff622)
+     (f32.const -nan:0x7ff622)
     )
    )
   )
   (call $logf32
    (f32.max
-    (f32.const -nan:0xffff82)
+    (f32.const -nan:0x7fff82)
     (f32.neg
-     (f32.const -nan:0xfff622)
+     (f32.const -nan:0x7ff622)
     )
    )
   )
@@ -122,13 +122,13 @@
    (f32.add
     (f32.const 0)
     (f32.neg
-     (f32.const -nan:0xfff622)
+     (f32.const -nan:0x7ff622)
     )
    )
   )
   (call $logf32
    (f32.add
-    (f32.const -nan:0xfff622)
+    (f32.const -nan:0x7ff622)
     (f32.neg
      (f32.const 0)
     )
@@ -138,13 +138,13 @@
    (f32.add
     (f32.const -0)
     (f32.neg
-     (f32.const -nan:0xfff622)
+     (f32.const -nan:0x7ff622)
     )
    )
   )
   (call $logf32
    (f32.add
-    (f32.const -nan:0xfff622)
+    (f32.const -nan:0x7ff622)
     (f32.neg
      (f32.const -0)
     )
@@ -154,13 +154,13 @@
    (f32.add
     (f32.const 0)
     (f32.neg
-     (f32.const nan:0xfff622)
+     (f32.const nan:0x7ff622)
     )
    )
   )
   (call $logf32
    (f32.add
-    (f32.const nan:0xfff622)
+    (f32.const nan:0x7ff622)
     (f32.neg
      (f32.const 0)
     )
diff --git a/test/passes/precompute_all-features.txt b/test/passes/precompute_all-features.txt
index 3f5908ef0..8021136f2 100644
--- a/test/passes/precompute_all-features.txt
+++ b/test/passes/precompute_all-features.txt
@@ -8,7 +8,7 @@
  (type $6 (func (result externref)))
  (global $global i32 (i32.const 1))
  (global $global-mut (mut i32) (i32.const 2))
- (memory $0 6 65536)
+ (memory $m 512 512)
  (data $0 (i32.const 0) "hello!")
  (elem declare func $dummy)
  (func $x (type $0) (param $x i32)
diff --git a/test/passes/precompute_all-features.wast b/test/passes/precompute_all-features.wast
index 633787fad..f6ad267f2 100644
--- a/test/passes/precompute_all-features.wast
+++ b/test/passes/precompute_all-features.wast
@@ -1,5 +1,6 @@
 (module
-  (memory (data "hello!") 512 512)
+  (memory $m 512 512)
+  (data (memory $m) (i32.const 0) "hello!")
   (type $0 (func (param i32)))
   (global $global i32 (i32.const 1))
   (global $global-mut (mut i32) (i32.const 2))
diff --git a/test/passes/remove-imports.wast b/test/passes/remove-imports.wast
index a96a438f5..77c16e991 100644
--- a/test/passes/remove-imports.wast
+++ b/test/passes/remove-imports.wast
@@ -3,10 +3,10 @@
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$d (func (result f64)))
-  (import $waka "somewhere" "waka")
-  (import $waka-ret "somewhere" "waka-ret" (result i32))
-  (import $waka-ret-d "somewhere" "waka-ret-d" (result f64))
-  (import $waka-sneaky "somewhere" "waka-sneaky")
+  (import "somewhere" "waka" (func $waka))
+  (import "somewhere" "waka-ret" (func $waka-ret (result i32)))
+  (import "somewhere" "waka-ret-d" (func $waka-ret-d (result f64)))
+  (import "somewhere" "waka-sneaky" (func $waka-sneaky))
   (import "env" "memBase" (global i32))
   (import "env" "table" (table $table 1 1 funcref))
   (elem (i32.const 0) $waka-sneaky)
diff --git a/test/passes/remove-unused-names_code-folding.wast b/test/passes/remove-unused-names_code-folding.wast
index 642bbdf7c..6fba5ddde 100644
--- a/test/passes/remove-unused-names_code-folding.wast
+++ b/test/passes/remove-unused-names_code-folding.wast
@@ -429,13 +429,13 @@
         (if (local.get $x)
           (then
             (block
-              (br_if $out (local.get $y i32))
+              (br_if $out (local.get $y))
               (nop)
             )
           )
           (else
             (block
-              (br_if $out (local.get $y i32))
+              (br_if $out (local.get $y))
               (nop)
             )
           )
@@ -443,13 +443,13 @@
         (if (local.get $x)
           (then
             (block
-              (br_if $out (local.get $y i32))
+              (br_if $out (local.get $y))
               (nop)
             )
           )
           (else
             (block
-              (br_if $out2 (local.get $y i32))
+              (br_if $out2 (local.get $y))
               (nop)
             )
           )
@@ -460,14 +460,14 @@
               (then
                 (block
                   (nop)
-                  (br_if $out (local.get $y i32))
+                  (br_if $out (local.get $y))
                   (nop)
                 )
               )
               (else
                 (block
                   (nop)
-                  (br_if $out2 (local.get $y i32))
+                  (br_if $out2 (local.get $y))
                   (nop)
                 )
               )
@@ -477,13 +477,13 @@
         (if (local.get $x)
           (then
             (block $left
-              (br_if $left (local.get $y i32))
+              (br_if $left (local.get $y))
               (nop)
             )
           )
           (else
             (block
-              (br_if $out (local.get $y i32))
+              (br_if $out (local.get $y))
               (nop)
             )
           )
@@ -491,13 +491,13 @@
         (if (local.get $x)
           (then
             (block
-              (br_if $out (local.get $y i32))
+              (br_if $out (local.get $y))
               (nop)
             )
           )
           (else
             (block $right
-              (br_if $right (local.get $y i32))
+              (br_if $right (local.get $y))
               (nop)
             )
           )
diff --git a/test/passes/remove-unused-nonfunction-module-elements_all-features.wast b/test/passes/remove-unused-nonfunction-module-elements_all-features.wast
index 5ed444ca2..2917b23a0 100644
--- a/test/passes/remove-unused-nonfunction-module-elements_all-features.wast
+++ b/test/passes/remove-unused-nonfunction-module-elements_all-features.wast
@@ -9,9 +9,9 @@
   (type $2-dupe (func (param i32) (result i32)))
   (type $2-thrupe (func (param i32) (result i32)))
   (export "memory" (memory $0))
-  (export "exported" $exported)
-  (export "other1" $other1)
-  (export "other2" $other2)
+  (export "exported" (func $exported))
+  (export "other1" (func $other1))
+  (export "other2" (func $other2))
   (table 1 1 funcref)
   (elem (i32.const 0) $called_indirect)
   (func $start (type $0)
@@ -94,7 +94,7 @@
   (type $0 (func))
   (import "env" "memory" (memory $0 256))
   (import "env" "table" (table 0 funcref))
-  (export "user" $user)
+  (export "user" (func $user))
   (func $user
     (drop (i32.load (i32.const 0)))
     (call_indirect (type $0) (i32.const 0))
@@ -102,28 +102,28 @@
 )
 (module ;; more use checks
   (memory $0 23 256 shared)
-  (export "user" $user)
+  (export "user" (func $user))
   (func $user
     (i32.store (i32.const 0) (i32.const 0))
   )
 )
 (module ;; more use checks
   (memory $0 23 256 shared)
-  (export "user" $user)
+  (export "user" (func $user))
   (func $user (result i32)
     (i32.atomic.rmw.add (i32.const 0) (i32.const 0))
   )
 )
 (module ;; more use checks
   (memory $0 23 256 shared)
-  (export "user" $user)
+  (export "user" (func $user))
   (func $user (result i32)
     (i32.atomic.rmw8.cmpxchg_u (i32.const 0) (i32.const 0) (i32.const 0))
   )
 )
 (module ;; more use checks
   (memory $0 23 256 shared)
-  (export "user" $user)
+  (export "user" (func $user))
   (func $user
     (local $0 i32)
     (local $1 i64)
@@ -138,28 +138,28 @@
 )
 (module ;; more use checks
   (memory $0 23 256 shared)
-  (export "user" $user)
+  (export "user" (func $user))
   (func $user (result i32)
     (memory.atomic.notify (i32.const 0) (i32.const 0))
   )
 )
 (module ;; more use checks
   (memory $0 23 256)
-  (export "user" $user)
+  (export "user" (func $user))
   (func $user (result i32)
     (memory.grow (i32.const 0))
   )
 )
 (module ;; more use checks
   (import "env" "memory" (memory $0 256))
-  (export "user" $user)
+  (export "user" (func $user))
   (func $user (result i32)
     (memory.grow (i32.const 0))
   )
 )
 (module ;; more use checks
   (memory $0 23 256)
-  (export "user" $user)
+  (export "user" (func $user))
   (func $user (result i32)
     (memory.size)
   )
diff --git a/test/passes/simplify-locals_all-features.wast b/test/passes/simplify-locals_all-features.wast
index b302a317d..e51abda5c 100644
--- a/test/passes/simplify-locals_all-features.wast
+++ b/test/passes/simplify-locals_all-features.wast
@@ -7,11 +7,11 @@
   (type $4 (func (param i32)))
   (type $5 (func (param i32) (result i32)))
   (type $6 (func (param i32 i32 i32 i32 i32 i32)))
-  (import $waka "env" "waka")
-  (import $waka_int "env" "waka_int" (result i32))
-  (import $_i64Subtract "env" "i64sub" (param i32 i32 i32 i32) (result i32))
-  (import $___udivmoddi4 "env" "moddi" (param i32 i32 i32 i32 i32) (result i32))
-  (import $lp "env" "lp" (param i32 i32) (result i32))
+  (import "env" "waka" (func $waka))
+  (import "env" "waka_int" (func $waka_int (result i32)))
+  (import "env" "i64sub" (func $_i64Subtract (param i32 i32 i32 i32) (result i32)))
+  (import "env" "moddi" (func $___udivmoddi4 (param i32 i32 i32 i32 i32) (result i32)))
+  (import "env" "lp" (func $lp (param i32 i32) (result i32)))
   (import "fuzzing-support" "log-f32" (func $fimport$0 (param f32)))
   (global $global$0 (mut i32) (i32.const 10))
   (func $contrast ;; check for tee and structure sinking
@@ -1710,7 +1710,7 @@
  (func $memory-init-store
   (local $x i32)
   (local.set $x
-   (block i32
+   (block (result i32)
     (i32.store (i32.const 0) (i32.const 42))
     (i32.const 0)
    )
@@ -1733,7 +1733,7 @@
  (func $memory-copy-store
   (local $x i32)
   (local.set $x
-   (block i32
+   (block (result i32)
     (i32.store (i32.const 0) (i32.const 42))
     (i32.const 0)
    )
@@ -1756,7 +1756,7 @@
  (func $memory-fill-store
   (local $x i32)
   (local.set $x
-   (block i32
+   (block (result i32)
     (i32.store (i32.const 0) (i32.const 42))
     (i32.const 0)
    )
@@ -1779,7 +1779,7 @@
  (func $data-drop-store
   (local $x i32)
   (local.set $x
-   (block i32
+   (block (result i32)
     (i32.store (i32.const 0) (i32.const 42))
     (i32.const 0)
    )
@@ -1792,7 +1792,7 @@
  (func $data-drop-memory-init
   (local $x i32)
   (local.set $x
-   (block i32
+   (block (result i32)
     (memory.init 0 (i32.const 0) (i32.const 0) (i32.const 5))
     (i32.const 0)
    )
diff --git a/test/passes/simplify-locals_all-features_disable-exception-handling.wast b/test/passes/simplify-locals_all-features_disable-exception-handling.wast
index 9cb4bf748..9fa89ea20 100644
--- a/test/passes/simplify-locals_all-features_disable-exception-handling.wast
+++ b/test/passes/simplify-locals_all-features_disable-exception-handling.wast
@@ -7,11 +7,11 @@
   (type $4 (func (param i32)))
   (type $5 (func (param i32) (result i32)))
   (type $6 (func (param i32 i32 i32 i32 i32 i32)))
-  (import $waka "env" "waka")
-  (import $waka_int "env" "waka_int" (result i32))
-  (import $_i64Subtract "env" "i64sub" (param i32 i32 i32 i32) (result i32))
-  (import $___udivmoddi4 "env" "moddi" (param i32 i32 i32 i32 i32) (result i32))
-  (import $lp "env" "lp" (param i32 i32) (result i32))
+  (import "env" "waka" (func $waka))
+  (import "env" "waka_int" (func $waka_int (result i32)))
+  (import "env" "i64sub" (func $_i64Subtract (param i32 i32 i32 i32) (result i32)))
+  (import "env" "moddi" (func $___udivmoddi4 (param i32 i32 i32 i32 i32) (result i32)))
+  (import "env" "lp" (func $lp (param i32 i32) (result i32)))
   (import "fuzzing-support" "log-f32" (func $fimport$0 (param f32)))
   (global $global$0 (mut i32) (i32.const 10))
   (func $contrast ;; check for tee and structure sinking
@@ -1710,7 +1710,7 @@
  (func $memory-init-store
   (local $x i32)
   (local.set $x
-   (block i32
+   (block (result i32)
     (i32.store (i32.const 0) (i32.const 42))
     (i32.const 0)
    )
@@ -1733,7 +1733,7 @@
  (func $memory-copy-store
   (local $x i32)
   (local.set $x
-   (block i32
+   (block (result i32)
     (i32.store (i32.const 0) (i32.const 42))
     (i32.const 0)
    )
@@ -1756,7 +1756,7 @@
  (func $memory-fill-store
   (local $x i32)
   (local.set $x
-   (block i32
+   (block (result i32)
     (i32.store (i32.const 0) (i32.const 42))
     (i32.const 0)
    )
@@ -1779,7 +1779,7 @@
  (func $data-drop-store
   (local $x i32)
   (local.set $x
-   (block i32
+   (block (result i32)
     (i32.store (i32.const 0) (i32.const 42))
     (i32.const 0)
    )
@@ -1792,7 +1792,7 @@
  (func $data-drop-memory-init
   (local $x i32)
   (local.set $x
-   (block i32
+   (block (result i32)
     (memory.init 0 (i32.const 0) (i32.const 0) (i32.const 5))
     (i32.const 0)
    )
diff --git a/test/passes/ssa-nomerge_enable-simd.wast b/test/passes/ssa-nomerge_enable-simd.wast
index f99febe3e..da44b57ae 100644
--- a/test/passes/ssa-nomerge_enable-simd.wast
+++ b/test/passes/ssa-nomerge_enable-simd.wast
@@ -23,7 +23,7 @@
     (local $x i32)
     (local $y i32)
     (drop
-      (if i32
+      (if (result i32)
         (i32.const 1)
         (then
           (local.get $x)
diff --git a/test/passes/ssa_enable-threads.wast b/test/passes/ssa_enable-threads.wast
index a368f3c34..d2614b791 100644
--- a/test/passes/ssa_enable-threads.wast
+++ b/test/passes/ssa_enable-threads.wast
@@ -22,7 +22,7 @@
     (local $x i32)
     (local $y i32)
     (drop
-      (if i32
+      (if (result i32)
         (i32.const 1)
         (then
           (local.get $x)
@@ -446,4 +446,3 @@
    (i32.const -54)
   )
 )
-