1 files changed, 38 insertions, 50 deletions
diff --git a/test/passes/simplify-locals_all-features_disable-exception-handling.txt b/test/passes/simplify-locals_all-features_disable-exception-handling.txt
index 2f8825c72..5a4dff21a 100644
--- a/test/passes/simplify-locals_all-features_disable-exception-handling.txt
+++ b/test/passes/simplify-locals_all-features_disable-exception-handling.txt
@@ -47,7 +47,7 @@
   )
   (nop)
   (drop
-   (block $block (result i32)
+   (block (result i32)
     (i32.const 5)
    )
   )
@@ -70,7 +70,7 @@
    (block $val (result i32)
     (if
      (i32.const 10)
-     (block $block4
+     (block
       (nop)
       (br $val
        (i32.const 11)
@@ -287,8 +287,8 @@
    (call $waka)
    (nop)
    (local.set $a
-    (block $block (result i32)
-     (block $block5
+    (block (result i32)
+     (block
       (nop)
       (i32.store
        (i32.const 104)
@@ -302,8 +302,8 @@
    )
    (call $waka)
    (local.set $a
-    (block $block6 (result i32)
-     (block $block7
+    (block (result i32)
+     (block
       (nop)
       (i32.store
        (i32.const 106)
@@ -321,8 +321,8 @@
    )
    (call $waka)
    (local.set $a
-    (block $block8 (result i32)
-     (block $block9
+    (block (result i32)
+     (block
       (nop)
       (i32.store
        (i32.const 108)
@@ -344,8 +344,8 @@
    )
    (call $waka)
    (local.set $a
-    (block $block10 (result i32)
-     (block $block11
+    (block (result i32)
+     (block
       (nop)
       (i32.store
        (i32.const 110)
@@ -759,7 +759,7 @@
   (local.set $x
    (loop $moar (result i32)
     (nop)
-    (block $block (result i32)
+    (block (result i32)
      (br_if $moar
       (local.get $x)
      )
@@ -769,7 +769,7 @@
   )
   (block $moar18
    (local.set $y
-    (block $block19 (result i32)
+    (block (result i32)
      (br_if $moar18
       (local.get $y)
      )
@@ -1092,7 +1092,7 @@
    )
    (if (result f64)
     (global.get $global$0)
-    (block $block
+    (block
      (global.set $global$0
       (i32.sub
        (global.get $global$0)
@@ -1263,7 +1263,7 @@
   (block $outside
    (loop $loop
     (br_if $outside
-     (block $block (result i32)
+     (block (result i32)
       (br_if $loop
        (local.get $temp)
       )
@@ -1294,7 +1294,7 @@
        (local.tee $temp
         (i32.const -1)
        )
-       (block $block (result i32)
+       (block (result i32)
         (nop)
         (i32.const 0)
        )
@@ -1351,18 +1351,14 @@
     (if (result i32)
      (i32.const 1)
      (block
-      (block $block
-       (nop)
-       (nop)
-       (br $out)
-      )
+      (nop)
+      (nop)
+      (br $out)
       (nop)
      )
      (block (result i32)
-      (block $block2
-       (nop)
-       (nop)
-      )
+      (nop)
+      (nop)
       (i32.const 4)
      )
     )
@@ -1371,30 +1367,26 @@
     (if (result i32)
      (i32.const 6)
      (block (result i32)
-      (block $block4
-       (nop)
-       (nop)
-      )
+      (nop)
+      (nop)
       (i32.const 7)
      )
      (block
-      (block $block5
-       (nop)
-       (nop)
-       (br $out)
-      )
+      (nop)
+      (nop)
+      (br $out)
       (nop)
      )
     )
    )
    (if
     (i32.const 11)
-    (block $block7
+    (block
      (nop)
      (nop)
      (br $out)
     )
-    (block $block8
+    (block
      (nop)
      (nop)
      (br $out)
@@ -1610,10 +1602,8 @@
      (i32.const 2)
     )
     (block (result i32)
-     (block $block
-      (nop)
-      (nop)
-     )
+     (nop)
+     (nop)
      (local.get $x)
     )
    )
@@ -1669,12 +1659,10 @@
        (f32.const -2048)
       )
       (block
-       (block $block
-        (call $fimport$1
-         (i32.const -25732)
-        )
-        (br $label$2)
+       (call $fimport$1
+        (i32.const -25732)
        )
+       (br $label$2)
        (nop)
       )
      )
@@ -1740,7 +1728,7 @@
  (func $memory-init-store
   (local $x i32)
   (local.set $x
-   (block $block (result i32)
+   (block (result i32)
     (i32.store
      (i32.const 0)
      (i32.const 42)
@@ -1776,7 +1764,7 @@
  (func $memory-copy-store
   (local $x i32)
   (local.set $x
-   (block $block (result i32)
+   (block (result i32)
     (i32.store
      (i32.const 0)
      (i32.const 42)
@@ -1812,7 +1800,7 @@
  (func $memory-fill-store
   (local $x i32)
   (local.set $x
-   (block $block (result i32)
+   (block (result i32)
     (i32.store
      (i32.const 0)
      (i32.const 42)
@@ -1844,7 +1832,7 @@
  (func $data-drop-store
   (local $x i32)
   (local.set $x
-   (block $block (result i32)
+   (block (result i32)
     (i32.store
      (i32.const 0)
      (i32.const 42)
@@ -1860,7 +1848,7 @@
  (func $data-drop-memory-init
   (local $x i32)
   (local.set $x
-   (block $block (result i32)
+   (block (result i32)
     (memory.init 0
      (i32.const 0)
      (i32.const 0)
@@ -1881,7 +1869,7 @@
   (local $0 funcref)
   (local $1 anyref)
   (local $2 anyref)
-  (block $block
+  (block
    (nop)
   )
   (nop)