1 files changed, 47 insertions, 47 deletions
diff --git a/test/passes/remove-unused-names_merge-blocks_enable-threads.txt b/test/passes/remove-unused-names_merge-blocks_enable-threads.txt
index 3fe8a5fdf..cf37ebc9d 100644
--- a/test/passes/remove-unused-names_merge-blocks_enable-threads.txt
+++ b/test/passes/remove-unused-names_merge-blocks_enable-threads.txt
@@ -8,21 +8,21 @@
  (memory $0 (shared 256 256))
  (table $0 1 1 funcref)
  (elem (i32.const 0) $call-i)
- (func $call-i (; 0 ;) (param $0 i32)
+ (func $call-i (param $0 i32)
   (nop)
  )
- (func $call-ii (; 1 ;) (param $0 i32) (param $1 i32)
+ (func $call-ii (param $0 i32) (param $1 i32)
   (nop)
  )
- (func $call-iii (; 2 ;) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $call-iii (param $0 i32) (param $1 i32) (param $2 i32)
   (nop)
  )
- (func $b0-yes (; 3 ;) (param $i1 i32)
+ (func $b0-yes (param $i1 i32)
   (drop
    (i32.const 10)
   )
  )
- (func $b0-no (; 4 ;) (param $i1 i32)
+ (func $b0-no (param $i1 i32)
   (block $topmost
    (block $block0
     (br $block0)
@@ -30,17 +30,17 @@
    (br $topmost)
   )
  )
- (func $b0-br-but-ok (; 5 ;) (param $i1 i32)
+ (func $b0-br-but-ok (param $i1 i32)
   (block $topmost
    (br $topmost)
   )
  )
- (func $b1-yes (; 6 ;) (param $i1 i32)
+ (func $b1-yes (param $i1 i32)
   (drop
    (i32.const 10)
   )
  )
- (func $b2-yes (; 7 ;) (param $i1 i32)
+ (func $b2-yes (param $i1 i32)
   (drop
    (i32.const 5)
   )
@@ -51,7 +51,7 @@
    (i32.const 15)
   )
  )
- (func $b3-yes (; 8 ;) (param $i1 i32)
+ (func $b3-yes (param $i1 i32)
   (drop
    (i32.const 3)
   )
@@ -68,7 +68,7 @@
    (i32.const 20)
   )
  )
- (func $b4 (; 9 ;) (param $i1 i32)
+ (func $b4 (param $i1 i32)
   (block $inner
    (drop
     (i32.const 10)
@@ -76,7 +76,7 @@
    (br $inner)
   )
  )
- (func $b5 (; 10 ;) (param $i1 i32)
+ (func $b5 (param $i1 i32)
   (block $middle
    (drop
     (i32.const 10)
@@ -87,7 +87,7 @@
    (br $middle)
   )
  )
- (func $b6 (; 11 ;) (param $i1 i32)
+ (func $b6 (param $i1 i32)
   (drop
    (i32.const 5)
   )
@@ -101,7 +101,7 @@
    (i32.const 15)
   )
  )
- (func $b7 (; 12 ;) (param $i1 i32)
+ (func $b7 (param $i1 i32)
   (drop
    (i32.const 3)
   )
@@ -124,7 +124,7 @@
    (i32.const 20)
   )
  )
- (func $unary (; 13 ;)
+ (func $unary
   (local $x i32)
   (drop
    (i32.eqz
@@ -175,7 +175,7 @@
    )
   )
  )
- (func $binary (; 14 ;)
+ (func $binary
   (drop
    (i32.add
     (block (result i32)
@@ -312,7 +312,7 @@
    )
   )
  )
- (func $trinary (; 15 ;)
+ (func $trinary
   (drop
    (i32.const 10)
   )
@@ -531,7 +531,7 @@
    )
   )
  )
- (func $breaks (; 16 ;)
+ (func $breaks
   (block $out
    (drop
     (i32.const 10)
@@ -581,7 +581,7 @@
    (unreachable)
   )
  )
- (func $calls (; 17 ;)
+ (func $calls
   (call $call-i
    (block (result i32)
     (i32.const 10)
@@ -739,7 +739,7 @@
    (unreachable)
   )
  )
- (func $atomics (; 18 ;)
+ (func $atomics
   (drop
    (i32.const 10)
   )
@@ -766,7 +766,7 @@
    )
   )
  )
- (func $mix-select (; 19 ;) (param $x i32)
+ (func $mix-select (param $x i32)
   (drop
    (select
     (local.get $x)
@@ -780,7 +780,7 @@
    )
   )
  )
- (func $block-type-change (; 20 ;)
+ (func $block-type-change
   (local $0 f64)
   (local $1 f64)
   (if
@@ -794,7 +794,7 @@
    (nop)
   )
  )
- (func $do-reorder (; 21 ;) (param $x i32)
+ (func $do-reorder (param $x i32)
   (local $y i32)
   (if
    (i32.const 1)
@@ -811,7 +811,7 @@
    )
   )
  )
- (func $do-not-reorder (; 22 ;) (param $x i32)
+ (func $do-not-reorder (param $x i32)
   (local $y i32)
   (if
    (i32.const 1)
@@ -828,7 +828,7 @@
    )
   )
  )
- (func $return-different-type (; 23 ;) (result i32)
+ (func $return-different-type (result i32)
   (drop
    (f64.abs
     (block
@@ -843,7 +843,7 @@
   )
   (unreachable)
  )
- (func $drop-unreachable (; 24 ;) (result i32)
+ (func $drop-unreachable (result i32)
   (local $0 i32)
   (drop
    (block (result i32)
@@ -852,7 +852,7 @@
   )
   (unreachable)
  )
- (func $concrete_finale_in_unreachable (; 25 ;) (result f64)
+ (func $concrete_finale_in_unreachable (result f64)
   (drop
    (block (result f64)
     (unreachable)
@@ -861,7 +861,7 @@
   )
   (f64.const -1)
  )
- (func $dont-move-unreachable (; 26 ;)
+ (func $dont-move-unreachable
   (loop $label$0
    (drop
     (block (result i32)
@@ -871,7 +871,7 @@
    )
   )
  )
- (func $dont-move-unreachable-last (; 27 ;)
+ (func $dont-move-unreachable-last
   (loop $label$0
    (drop
     (block (result i32)
@@ -881,7 +881,7 @@
    )
   )
  )
- (func $move-around-unreachable-in-middle (; 28 ;)
+ (func $move-around-unreachable-in-middle
   (loop $label$0
    (nop)
    (drop
@@ -897,7 +897,7 @@
    )
   )
  )
- (func $drop-unreachable-block-with-concrete-final (; 29 ;)
+ (func $drop-unreachable-block-with-concrete-final
   (drop
    (block (result i32)
     (drop
@@ -911,7 +911,7 @@
    )
   )
  )
- (func $merging-with-unreachable-in-middle (; 30 ;) (result i32)
+ (func $merging-with-unreachable-in-middle (result i32)
   (block (result i32)
    (return
     (i32.const 21536)
@@ -922,7 +922,7 @@
    (i32.const 19299)
   )
  )
- (func $remove-br-after-unreachable (; 31 ;)
+ (func $remove-br-after-unreachable
   (block $label$9
    (drop
     (block
@@ -934,7 +934,7 @@
    )
   )
  )
- (func $block-tails (; 32 ;)
+ (func $block-tails
   (block $l1
    (drop
     (i32.const -2)
@@ -1071,7 +1071,7 @@
    )
   )
  )
- (func $loop-tails (; 33 ;)
+ (func $loop-tails
   (loop $l1
    (drop
     (i32.const -2)
@@ -1220,7 +1220,7 @@
    (i32.const 33)
   )
  )
- (func $block-tail-one (; 34 ;)
+ (func $block-tail-one
   (block $l1
    (drop
     (i32.const -2)
@@ -1240,7 +1240,7 @@
    (i32.const 2)
   )
  )
- (func $loop-tail-one (; 35 ;)
+ (func $loop-tail-one
   (loop $l1
    (drop
     (i32.const -2)
@@ -1260,7 +1260,7 @@
    (i32.const 2)
   )
  )
- (func $block-tail-value (; 36 ;) (result i32)
+ (func $block-tail-value (result i32)
   (block $l1 (result i32)
    (drop
     (i32.const -1)
@@ -1274,7 +1274,7 @@
    (i32.const 2)
   )
  )
- (func $block-tail-empty (; 37 ;)
+ (func $block-tail-empty
   (block $l1
    (drop
     (i32.const -1)
@@ -1282,7 +1282,7 @@
    (br $l1)
   )
  )
- (func $loop-tail-empty (; 38 ;)
+ (func $loop-tail-empty
   (loop $l1
    (drop
     (i32.const -1)
@@ -1290,7 +1290,7 @@
    (br $l1)
   )
  )
- (func $block-tail-unreachable (; 39 ;) (result i32)
+ (func $block-tail-unreachable (result i32)
   (block $l1 (result i32)
    (drop
     (i32.const -1)
@@ -1307,7 +1307,7 @@
    (unreachable)
   )
  )
- (func $loop-tail-unreachable (; 40 ;) (result i32)
+ (func $loop-tail-unreachable (result i32)
   (loop $l1
    (drop
     (i32.const -1)
@@ -1325,7 +1325,7 @@
 (module
  (type $none_=>_i32 (func (result i32)))
  (type $f64_i32_=>_i32 (func (param f64 i32) (result i32)))
- (func $unreachable-in-sub-block (; 0 ;) (param $0 f64) (param $1 i32) (result i32)
+ (func $unreachable-in-sub-block (param $0 f64) (param $1 i32) (result i32)
   (local $2 i32)
   (local $9 i32)
   (loop $label$1
@@ -1354,13 +1354,13 @@
   (nop)
   (local.get $9)
  )
- (func $trivial (; 1 ;) (result i32)
+ (func $trivial (result i32)
   (block
    (unreachable)
    (nop)
   )
  )
- (func $trivial-more (; 2 ;) (result i32)
+ (func $trivial-more (result i32)
   (block
    (nop)
    (unreachable)
@@ -1377,7 +1377,7 @@
 )
 (module
  (type $none_=>_none (func))
- (func $merge-some-block (; 0 ;)
+ (func $merge-some-block
   (drop
    (i32.const 1)
   )
@@ -1454,7 +1454,7 @@
    )
   )
  )
- (func $merge-some-loop (; 1 ;)
+ (func $merge-some-loop
   (drop
    (i32.const 1)
   )
@@ -1522,7 +1522,7 @@
    )
   )
  )
- (func $merge-some-loop-taken (; 2 ;)
+ (func $merge-some-loop-taken
   (loop $l1
    (block $b1
     (drop