1 files changed, 73 insertions, 73 deletions
diff --git a/test/wasm2js/br_table_temp.wast b/test/wasm2js/br_table_temp.wast
index 2c49ca9be..e629db646 100644
--- a/test/wasm2js/br_table_temp.wast
+++ b/test/wasm2js/br_table_temp.wast
@@ -18,16 +18,16 @@
   )
 
   (func (export "type-i32-value") (result i32)
-    (block i32 (i32.ctz (br_table 0 0 (i32.const 1) (i32.const 0))))
+    (block (result i32) (i32.ctz (br_table 0 0 (i32.const 1) (i32.const 0))))
   )
   (func (export "type-i64-value") (result i32)
-    (i32.wrap_i64 (block i64 (i64.ctz (br_table 0 0 (i64.const 2) (i32.const 0)))))
+    (i32.wrap_i64 (block (result i64) (i64.ctz (br_table 0 0 (i64.const 2) (i32.const 0)))))
   )
   (func (export "type-f32-value") (result f32)
-    (block f32 (f32.neg (br_table 0 0 (f32.const 3) (i32.const 0))))
+    (block (result f32) (f32.neg (br_table 0 0 (f32.const 3) (i32.const 0))))
   )
   (func (export "type-f64-value") (result f64)
-    (block f64 (f64.neg (br_table 0 0 (f64.const 4) (i32.const 0))))
+    (block (result f64) (f64.neg (br_table 0 0 (f64.const 4) (i32.const 0))))
   )
 
   (func (export "empty") (param i32) (result i32)
@@ -35,7 +35,7 @@
     (i32.const 22)
   )
   (func (export "empty-value") (param i32) (result i32)
-    (block i32 (br_table 0 (i32.const 33) (local.get 0)) (i32.const 31))
+    (block (result i32) (br_table 0 (i32.const 33) (local.get 0)) (i32.const 31))
   )
 
   (func (export "singleton") (param i32) (result i32)
@@ -50,9 +50,9 @@
   )
 
   (func (export "singleton-value") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (drop
-        (block i32
+        (block (result i32)
           (br_table 0 1 (i32.const 33) (local.get 0))
           (return (i32.const 31))
         )
@@ -83,11 +83,11 @@
 
   (func (export "multiple-value") (param i32) (result i32)
     (local i32)
-    (local.set 1 (block i32
-      (local.set 1 (block i32
-        (local.set 1 (block i32
-          (local.set 1 (block i32
-            (local.set 1 (block i32
+    (local.set 1 (block (result i32)
+      (local.set 1 (block (result i32)
+        (local.set 1 (block (result i32)
+          (local.set 1 (block (result i32)
+            (local.set 1 (block (result i32)
               (br_table 3 2 1 0 4 (i32.const 200) (local.get 0))
               (return (i32.add (local.get 1) (i32.const 99)))
             ))
@@ -849,38 +849,38 @@
     (block (nop) (call $dummy) (br_table 0 0 0 (i32.const 0)))
   )
   (func (export "as-block-value") (result i32)
-    (block i32 (nop) (call $dummy) (br_table 0 0 0 (i32.const 2) (i32.const 0)))
+    (block (result i32) (nop) (call $dummy) (br_table 0 0 0 (i32.const 2) (i32.const 0)))
   )
 
   (func (export "as-loop-first") (result i32)
-    (loop i32 (br_table 1 1 (i32.const 3) (i32.const 0)) (i32.const 1))
+    (loop (result i32) (br_table 1 1 (i32.const 3) (i32.const 0)) (i32.const 1))
   )
   (func (export "as-loop-mid") (result i32)
-    (loop i32
+    (loop (result i32)
       (call $dummy)
       (br_table 1 1 1 (i32.const 4) (i32.const -1))
       (i32.const 2)
     )
   )
   (func (export "as-loop-last") (result i32)
-    (loop i32 (nop) (call $dummy) (br_table 1 1 1 (i32.const 5) (i32.const 1)))
+    (loop (result i32) (nop) (call $dummy) (br_table 1 1 1 (i32.const 5) (i32.const 1)))
   )
 
   (func (export "as-br-value") (result i32)
-    (block i32 (br 0 (br 0 (i32.const 9))))
+    (block (result i32) (br 0 (br 0 (i32.const 9))))
   )
 
   (func (export "as-br_if-cond")
     (block (br_if 0 (br_table 0 0 0 (i32.const 1))))
   )
   (func (export "as-br_if-value") (result i32)
-    (block i32
+    (block (result i32)
       (br_if 0 (br_table 0 (i32.const 8) (i32.const 0)) (i32.const 1))
       (i32.const 7)
     )
   )
   (func (export "as-br_if-value-cond") (result i32)
-    (block i32
+    (block (result i32)
       (drop (br_if 0 (i32.const 6) (br_table 0 0 (i32.const 9) (i32.const 0))))
       (i32.const 7)
     )
@@ -890,25 +890,25 @@
     (block (br_table 0 0 0 (br_table 0 (i32.const 1))))
   )
   (func (export "as-br_table-value") (result i32)
-    (block i32
+    (block (result i32)
       (br_table 0 0 0 (br_table 0 (i32.const 10) (i32.const 0)) (i32.const 1))
       (i32.const 7)
     )
   )
   (func (export "as-br_table-value-index") (result i32)
-    (block i32
+    (block (result i32)
       (br_table 0 0 (i32.const 6) (br_table 0 (i32.const 11) (i32.const 1)))
       (i32.const 7)
     )
   )
 
   (func (export "as-return-value") (result i32)
-    (i32.wrap_i64 (block i64 (return (br_table 0 (i64.const 7) (i32.const 0)))))
+    (i32.wrap_i64 (block (result i64) (return (br_table 0 (i64.const 7) (i32.const 0)))))
   )
 
   (func (export "as-if-cond") (result i32)
-    (block i32
-      (if i32
+    (block (result i32)
+      (if (result i32)
         (br_table 0 (i32.const 2) (i32.const 0))
         (then
           (i32.const 0)
@@ -920,8 +920,8 @@
     )
   )
   (func (export "as-if-then") (param i32 i32) (result i32)
-    (block i32
-      (if i32
+    (block (result i32)
+      (if (result i32)
         (local.get 0)
         (then
           (br_table 1 (i32.const 3) (i32.const 0))
@@ -933,8 +933,8 @@
     )
   )
   (func (export "as-if-else") (param i32 i32) (result i32)
-    (block i32
-      (if i32
+    (block (result i32)
+      (if (result i32)
         (local.get 0)
         (then
           (local.get 1)
@@ -947,21 +947,21 @@
   )
 
   (func (export "as-select-first") (param i32 i32) (result i32)
-    (block i32
+    (block (result i32)
       (select
         (br_table 0 (i32.const 5) (i32.const 0)) (local.get 0) (local.get 1)
       )
     )
   )
   (func (export "as-select-second") (param i32 i32) (result i32)
-    (block i32
+    (block (result i32)
       (select
         (local.get 0) (br_table 0 (i32.const 6) (i32.const 1)) (local.get 1)
       )
     )
   )
   (func (export "as-select-cond") (result i32)
-    (block i32
+    (block (result i32)
       (select
         (i32.const 0) (i32.const 1) (br_table 0 (i32.const 7) (i32.const 1))
       )
@@ -970,21 +970,21 @@
 
   (func $f (param i32 i32 i32) (result i32) (i32.const -1))
   (func (export "as-call-first") (result i32)
-    (block i32
+    (block (result i32)
       (call $f
         (br_table 0 (i32.const 12) (i32.const 1)) (i32.const 2) (i32.const 3)
       )
     )
   )
   (func (export "as-call-mid") (result i32)
-    (block i32
+    (block (result i32)
       (call $f
         (i32.const 1) (br_table 0 (i32.const 13) (i32.const 1)) (i32.const 3)
       )
     )
   )
   (func (export "as-call-last") (result i32)
-    (block i32
+    (block (result i32)
       (call $f
         (i32.const 1) (i32.const 2) (br_table 0 (i32.const 14) (i32.const 1))
       )
@@ -994,7 +994,7 @@
   (type $sig (func (param i32 i32 i32) (result i32)))
   (table funcref (elem $f))
   (func (export "as-call_indirect-first") (result i32)
-    (block i32
+    (block (result i32)
       (call_indirect (type $sig)
         (br_table 0 (i32.const 20) (i32.const 1)) (i32.const 1) (i32.const 2)
         (i32.const 3)
@@ -1002,7 +1002,7 @@
     )
   )
   (func (export "as-call_indirect-mid") (result i32)
-    (block i32
+    (block (result i32)
       (call_indirect (type $sig)
         (i32.const 0) (br_table 0 (i32.const 21) (i32.const 1)) (i32.const 2)
         (i32.const 3)
@@ -1010,7 +1010,7 @@
     )
   )
   (func (export "as-call_indirect-last") (result i32)
-    (block i32
+    (block (result i32)
       (call_indirect (type $sig)
         (i32.const 0) (i32.const 1) (br_table 0 (i32.const 22) (i32.const 1))
         (i32.const 3)
@@ -1018,7 +1018,7 @@
     )
   )
   (func (export "as-call_indirect-func") (result i32)
-    (block i32
+    (block (result i32)
       (call_indirect (type $sig)
         (i32.const 0) (i32.const 1) (i32.const 2)
         (br_table 0 (i32.const 23) (i32.const 1))
@@ -1028,7 +1028,7 @@
 
   (func (export "as-local.set-value") (result i32)
     (local f32)
-    (block i32
+    (block (result i32)
       (local.set 0 (br_table 0 (i32.const 17) (i32.const 1)))
       (i32.const -1)
     )
@@ -1036,85 +1036,85 @@
 
   (memory 1)
   (func (export "as-load-address") (result i32)
-    (block i32 (i32.load (br_table 0 (i32.const 2) (i32.const 1))))
+    (block (result i32) (i32.load (br_table 0 (i32.const 2) (i32.const 1))))
   )
   (func (export "as-loadN-address") (result i32)
-    (i32.wrap_i64 (block i64 (i64.load8_s (br_table 0 (i64.const 30) (i32.const 1)))))
+    (i32.wrap_i64 (block (result i64) (i64.load8_s (br_table 0 (i64.const 30) (i32.const 1)))))
   )
 
   (func (export "as-store-address") (result i32)
-    (block i32
+    (block (result i32)
       (f64.store (br_table 0 (i32.const 30) (i32.const 1)) (f64.const 7))
       (i32.const -1)
     )
   )
   (func (export "as-store-value") (result i32)
-    (block i32
+    (block (result i32)
       (i64.store (i32.const 2) (br_table 0 (i32.const 31) (i32.const 1)))
       (i32.const -1)
      )
   )
 
   (func (export "as-storeN-address") (result i32)
-    (block i32
+    (block (result i32)
       (i32.store8 (br_table 0 (i32.const 32) (i32.const 0)) (i32.const 7))
       (i32.const -1)
     )
   )
   (func (export "as-storeN-value") (result i32)
-    (block i32
+    (block (result i32)
       (i64.store16 (i32.const 2) (br_table 0 (i32.const 33) (i32.const 0)))
       (i32.const -1)
     )
   )
 
   (func (export "as-unary-operand") (result i32)
-    (block i32 (i32.ctz (br_table 0 (i32.const 3) (i32.const 0))))
+    (block (result i32) (i32.ctz (br_table 0 (i32.const 3) (i32.const 0))))
   )
 
   (func (export "as-binary-left") (result i32)
-    (block i32
+    (block (result i32)
       (i32.add (br_table 0 0 (i32.const 3) (i32.const 0)) (i32.const 10))
     )
   )
   (func (export "as-binary-right") (result i32)
-    (i32.wrap_i64 (block i64
+    (i32.wrap_i64 (block (result i64)
       (i64.add (i64.const 10) (br_table 0 (i64.const 45) (i32.const 0))))
     )
   )
 
   (func (export "as-test-operand") (result i32)
-    (block i32 (i32.eqz (br_table 0 (i32.const 44) (i32.const 0))))
+    (block (result i32) (i32.eqz (br_table 0 (i32.const 44) (i32.const 0))))
   )
 
   (func (export "as-compare-left") (result i32)
-    (block i32
+    (block (result i32)
       (f64.le (br_table 0 0 (i32.const 43) (i32.const 0)) (f64.const 10))
     )
   )
   (func (export "as-compare-right") (result i32)
-    (block i32
+    (block (result i32)
       (f32.ne (f32.const 10) (br_table 0 (i32.const 42) (i32.const 0)))
     )
   )
 
   (func (export "as-convert-operand") (result i32)
-    (block i32 (i32.wrap_i64 (br_table 0 (i32.const 41) (i32.const 0))))
+    (block (result i32) (i32.wrap_i64 (br_table 0 (i32.const 41) (i32.const 0))))
   )
 
   (func (export "as-memory.grow-size") (result i32)
-    (block i32 (memory.grow (br_table 0 (i32.const 40) (i32.const 0))))
+    (block (result i32) (memory.grow (br_table 0 (i32.const 40) (i32.const 0))))
   )
 
   (func (export "nested-block-value") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (drop (i32.const -1))
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (i32.add
             (i32.const 2)
-            (block i32
+            (block (result i32)
               (drop (i32.const 4))
               (i32.add
                 (i32.const 8)
@@ -1128,13 +1128,13 @@
   )
 
   (func (export "nested-br-value") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (drop (i32.const 2))
           (drop
-            (block i32
+            (block (result i32)
               (drop (i32.const 4))
               (br 0 (br_table 2 1 0 (i32.const 8) (local.get 0)))
             )
@@ -1146,13 +1146,13 @@
   )
 
   (func (export "nested-br_if-value") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (drop (i32.const 2))
           (drop
-            (block i32
+            (block (result i32)
               (drop (i32.const 4))
               (br_if 0 (br_table 0 1 2 (i32.const 8) (local.get 0)) (i32.const 1))
               (i32.const 32)
@@ -1165,10 +1165,10 @@
   )
 
   (func (export "nested-br_if-value-cond") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (drop (i32.const 2))
           (drop (br_if 0 (i32.const 4) (br_table 0 1 0 (i32.const 8) (local.get 0))))
           (i32.const 16)
@@ -1178,13 +1178,13 @@
   )
 
   (func (export "nested-br_table-value") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (drop (i32.const 2))
           (drop
-            (block i32
+            (block (result i32)
               (drop (i32.const 4))
               (br_table 0 (br_table 0 1 2 (i32.const 8) (local.get 0)) (i32.const 1))
               (i32.const 32)
@@ -1197,10 +1197,10 @@
   )
 
   (func (export "nested-br_table-value-index") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (drop (i32.const 2))
           (br_table 0 (i32.const 4) (br_table 0 1 0 (i32.const 8) (local.get 0)))
           (i32.const 16)
@@ -1405,13 +1405,13 @@
 
 (assert_invalid
   (module (func $type-arg-void-vs-num (result i32)
-    (block i32 (br_table 0 (nop) (i32.const 1)) (i32.const 1))
+    (block (result i32) (br_table 0 (nop) (i32.const 1)) (i32.const 1))
   ))
   "type mismatch"
 )
 (assert_invalid
   (module (func $type-arg-num-vs-num (result i32)
-    (block i32 (br_table 0 0 0 (i64.const 1) (i32.const 1)) (i32.const 1))
+    (block (result i32) (br_table 0 0 0 (i64.const 1) (i32.const 1)) (i32.const 1))
   ))
   "type mismatch"
 )
@@ -1430,13 +1430,13 @@
 )
 (assert_invalid
   (module (func $type-arg-index-void-vs-i32 (result i32)
-    (block i32 (br_table 0 0 (i32.const 0) (nop)) (i32.const 1))
+    (block (result i32) (br_table 0 0 (i32.const 0) (nop)) (i32.const 1))
   ))
   "type mismatch"
 )
 (assert_invalid
   (module (func $type-arg-index-num-vs-i32 (result i32)
-    (block i32 (br_table 0 0 (i32.const 0) (i64.const 0)) (i32.const 1))
+    (block (result i32) (br_table 0 0 (i32.const 0) (i64.const 0)) (i32.const 1))
   ))
   "type mismatch"
 )