1 files changed, 56 insertions, 56 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 60459d1a8..7be68af6d 100644
--- a/test/passes/simplify-locals_all-features_disable-exception-handling.txt
+++ b/test/passes/simplify-locals_all-features_disable-exception-handling.txt
@@ -20,7 +20,7 @@
  (import "fuzzing-support" "log-f32" (func $fimport$0 (param f32)))
  (memory $0 256 256)
  (global $global$0 (mut i32) (i32.const 10))
- (func $contrast (; 6 ;)
+ (func $contrast
   (local $x i32)
   (local $y i32)
   (local $z i32)
@@ -82,7 +82,7 @@
    )
   )
  )
- (func $b0-yes (; 7 ;) (param $i1 i32)
+ (func $b0-yes (param $i1 i32)
   (local $x i32)
   (local $y i32)
   (local $a i32)
@@ -400,7 +400,7 @@
    )
   )
  )
- (func $Ia (; 8 ;) (param $a i32) (result i32)
+ (func $Ia (param $a i32) (result i32)
   (local $b i32)
   (block $switch$0
    (block $switch-default$6
@@ -411,7 +411,7 @@
    (i32.const 60)
   )
  )
- (func $memories (; 9 ;) (param $i2 i32) (param $i3 i32) (param $bi2 i32) (param $bi3 i32) (param $ci3 i32) (param $di3 i32)
+ (func $memories (param $i2 i32) (param $i3 i32) (param $bi2 i32) (param $bi3 i32) (param $ci3 i32) (param $di3 i32)
   (local $set_with_no_get i32)
   (nop)
   (i32.store8
@@ -441,7 +441,7 @@
   )
   (nop)
  )
- (func $___remdi3 (; 10 ;) (param $$a$0 i32) (param $$a$1 i32) (param $$b$0 i32) (param $$b$1 i32) (result i32)
+ (func $___remdi3 (param $$a$0 i32) (param $$a$1 i32) (param $$b$0 i32) (param $$b$1 i32) (result i32)
   (local $$1$1 i32)
   (local $$1$0 i32)
   (local $$rem i32)
@@ -634,7 +634,7 @@
    )
   )
  )
- (func $block-returns (; 11 ;)
+ (func $block-returns
   (local $x i32)
   (local.set $x
    (block $out (result i32)
@@ -708,7 +708,7 @@
    )
   )
  )
- (func $multiple (; 12 ;) (param $s i32) (param $r i32) (param $f i32) (param $p i32) (param $t i32) (param $m i32)
+ (func $multiple (param $s i32) (param $r i32) (param $f i32) (param $p i32) (param $t i32) (param $m i32)
   (nop)
   (local.set $r
    (i32.add
@@ -735,7 +735,7 @@
    (local.get $t)
   )
  )
- (func $switch-def (; 13 ;) (param $i3 i32) (result i32)
+ (func $switch-def (param $i3 i32) (result i32)
   (local $i1 i32)
   (local.set $i1
    (i32.const 10)
@@ -754,7 +754,7 @@
    (local.get $i1)
   )
  )
- (func $no-out-of-label (; 14 ;) (param $x i32) (param $y i32)
+ (func $no-out-of-label (param $x i32) (param $y i32)
   (nop)
   (local.set $x
    (loop $moar (result i32)
@@ -781,7 +781,7 @@
    (local.get $y)
   )
  )
- (func $freetype-cd (; 15 ;) (param $a i32) (result i32)
+ (func $freetype-cd (param $a i32) (result i32)
   (local $e i32)
   (nop)
   (local.tee $a
@@ -809,7 +809,7 @@
    )
   )
  )
- (func $drop-if-value (; 16 ;) (param $x i32) (param $y i32) (param $z i32) (result i32)
+ (func $drop-if-value (param $x i32) (param $y i32) (param $z i32) (result i32)
   (local $temp i32)
   (drop
    (if (result i32)
@@ -837,7 +837,7 @@
    (i32.const 0)
   )
  )
- (func $drop-br_if (; 17 ;) (param $label i32) (param $$cond2 i32) (param $$$0151 i32) (result i32)
+ (func $drop-br_if (param $label i32) (param $$cond2 i32) (param $$$0151 i32) (result i32)
   (nop)
   (local.tee $label
    (block $label$break$L4 (result i32)
@@ -869,7 +869,7 @@
    )
   )
  )
- (func $drop-tee-unreachable (; 18 ;)
+ (func $drop-tee-unreachable
   (local $x i32)
   (local.tee $x
    (unreachable)
@@ -878,7 +878,7 @@
    (local.get $x)
   )
  )
- (func $if-return-but-unreachable (; 19 ;) (param $var$0 i64)
+ (func $if-return-but-unreachable (param $var$0 i64)
   (if
    (unreachable)
    (drop
@@ -889,7 +889,7 @@
    )
   )
  )
- (func $if-one-side (; 20 ;) (result i32)
+ (func $if-one-side (result i32)
   (local $x i32)
   (nop)
   (local.tee $x
@@ -903,7 +903,7 @@
    )
   )
  )
- (func $if-one-side-undo (; 21 ;) (result i32)
+ (func $if-one-side-undo (result i32)
   (local $x i32)
   (local $y i32)
   (local.set $y
@@ -921,7 +921,7 @@
   )
   (local.get $y)
  )
- (func $if-one-side-multi (; 22 ;) (param $0 i32) (result i32)
+ (func $if-one-side-multi (param $0 i32) (result i32)
   (nop)
   (local.tee $0
    (if (result i32)
@@ -950,7 +950,7 @@
    )
   )
  )
- (func $if-one-side-undo-but-its-a-tee (; 23 ;) (param $0 i32) (result i32)
+ (func $if-one-side-undo-but-its-a-tee (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1029,7 +1029,7 @@
   )
   (i32.const 0)
  )
- (func $splittable-ifs-multicycle (; 24 ;) (param $20 i32) (result i32)
+ (func $splittable-ifs-multicycle (param $20 i32) (result i32)
   (nop)
   (local.tee $20
    (if (result i32)
@@ -1047,7 +1047,7 @@
    )
   )
  )
- (func $update-getCounter (; 25 ;) (param $0 i32) (param $1 f64) (param $2 f64) (param $3 f32) (param $4 i32) (result f64)
+ (func $update-getCounter (param $0 i32) (param $1 f64) (param $2 f64) (param $3 f32) (param $4 i32) (result f64)
   (global.set $global$0
    (i32.sub
     (global.get $global$0)
@@ -1131,7 +1131,7 @@
  (import "fuzzing-support" "log3" (func $fimport$2 (param f32)))
  (memory $0 (shared 256 256))
  (global $global$0 (mut i32) (i32.const 10))
- (func $nonatomics (; 3 ;) (result i32)
+ (func $nonatomics (result i32)
   (local $x i32)
   (nop)
   (drop
@@ -1143,7 +1143,7 @@
    (i32.const 1024)
   )
  )
- (func $nonatomic-growmem (; 4 ;) (result i32)
+ (func $nonatomic-growmem (result i32)
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1159,7 +1159,7 @@
   )
   (local.get $x)
  )
- (func $atomics (; 5 ;)
+ (func $atomics
   (local $x i32)
   (local.set $x
    (i32.atomic.load
@@ -1175,7 +1175,7 @@
    (local.get $x)
   )
  )
- (func $one-atomic (; 6 ;)
+ (func $one-atomic
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1191,7 +1191,7 @@
    (local.get $x)
   )
  )
- (func $other-atomic (; 7 ;)
+ (func $other-atomic
   (local $x i32)
   (local.set $x
    (i32.atomic.load
@@ -1207,7 +1207,7 @@
    (local.get $x)
   )
  )
- (func $atomic-growmem (; 8 ;) (result i32)
+ (func $atomic-growmem (result i32)
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1223,7 +1223,7 @@
   )
   (local.get $x)
  )
- (func $atomicrmw (; 9 ;)
+ (func $atomicrmw
   (local $x i32)
   (local.set $x
    (i32.atomic.rmw.add
@@ -1240,7 +1240,7 @@
    (local.get $x)
   )
  )
- (func $atomic-cmpxchg (; 10 ;)
+ (func $atomic-cmpxchg
   (local $x i32)
   (local.set $x
    (i32.atomic.rmw.cmpxchg
@@ -1258,7 +1258,7 @@
    (local.get $x)
   )
  )
- (func $br-value-reordering (; 11 ;) (result i32)
+ (func $br-value-reordering (result i32)
   (local $temp i32)
   (block $outside
    (loop $loop
@@ -1281,7 +1281,7 @@
   )
   (unreachable)
  )
- (func $br-value-reordering-safe (; 12 ;) (result i32)
+ (func $br-value-reordering-safe (result i32)
   (local $temp i32)
   (local.set $temp
    (block $outside (result i32)
@@ -1307,7 +1307,7 @@
   )
   (unreachable)
  )
- (func $if-one-side-unreachable (; 13 ;)
+ (func $if-one-side-unreachable
   (local $x i32)
   (block $out
    (drop
@@ -1343,7 +1343,7 @@
    )
   )
  )
- (func $if-one-side-unreachable-blocks (; 14 ;)
+ (func $if-one-side-unreachable-blocks
   (local $x i32)
   (local $y i32)
   (block $out
@@ -1402,7 +1402,7 @@
    )
   )
  )
- (func $loop-value (; 15 ;) (param $x i32) (result i32)
+ (func $loop-value (param $x i32) (result i32)
   (loop $loopy
    (unreachable)
   )
@@ -1412,7 +1412,7 @@
    (i32.const 1)
   )
  )
- (func $loop-loop-loopy-value (; 16 ;) (param $x i32) (result i32)
+ (func $loop-loop-loopy-value (param $x i32) (result i32)
   (nop)
   (loop $loopy1 (result i32)
    (nop)
@@ -1425,7 +1425,7 @@
    )
   )
  )
- (func $loop-modified-during-main-pass-be-careful-fuzz (; 17 ;) (result i32)
+ (func $loop-modified-during-main-pass-be-careful-fuzz (result i32)
   (local $0 i32)
   (nop)
   (if (result i32)
@@ -1442,11 +1442,11 @@
    )
   )
  )
- (func $loop-later (; 18 ;) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32)
+ (func $loop-later (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32)
   (nop)
   (i32.const 0)
  )
- (func $pick (; 19 ;)
+ (func $pick
   (local $x i32)
   (local $y i32)
   (local.set $x
@@ -1469,7 +1469,7 @@
    (local.get $y)
   )
  )
- (func $pick-2 (; 20 ;)
+ (func $pick-2
   (local $x i32)
   (local $y i32)
   (local.set $y
@@ -1492,7 +1492,7 @@
    (local.get $x)
   )
  )
- (func $many (; 21 ;)
+ (func $many
   (local $x i32)
   (local $y i32)
   (local $z i32)
@@ -1563,7 +1563,7 @@
    (local.get $x)
   )
  )
- (func $loop-copies (; 22 ;) (param $x i32) (param $y i32)
+ (func $loop-copies (param $x i32) (param $y i32)
   (loop $loop
    (nop)
    (drop
@@ -1574,7 +1574,7 @@
    )
   )
  )
- (func $proper-type (; 23 ;) (result f64)
+ (func $proper-type (result f64)
   (local $var$0 i32)
   (local $var$2 f64)
   (local.set $var$0
@@ -1586,7 +1586,7 @@
   )
   (local.get $var$2)
  )
- (func $multi-pass-get-equivs-right (; 24 ;) (param $var$0 i32) (param $var$1 i32) (result f64)
+ (func $multi-pass-get-equivs-right (param $var$0 i32) (param $var$1 i32) (result f64)
   (local $var$2 i32)
   (nop)
   (i32.store
@@ -1599,7 +1599,7 @@
    )
   )
  )
- (func $if-value-structure-equivalent (; 25 ;) (param $x i32) (result i32)
+ (func $if-value-structure-equivalent (param $x i32) (result i32)
   (local $y i32)
   (nop)
   (local.tee $x
@@ -1619,7 +1619,7 @@
    )
   )
  )
- (func $set-tee-need-one-of-them (; 26 ;) (param $var$0 i32) (param $var$1 i32) (result i32)
+ (func $set-tee-need-one-of-them (param $var$0 i32) (param $var$1 i32) (result i32)
   (local $var$2 i32)
   (local $var$3 i32)
   (local.set $var$2
@@ -1632,7 +1632,7 @@
   )
   (local.get $var$2)
  )
- (func $loop-value-harder (; 27 ;) (result i32)
+ (func $loop-value-harder (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1687,7 +1687,7 @@
    (i32.const -5417091)
   )
  )
- (func $tee-chain (; 28 ;) (param $x i32) (param $z i32) (param $t1 i32) (param $t2 i32) (param $t3 i32) (result i32)
+ (func $tee-chain (param $x i32) (param $z i32) (param $t1 i32) (param $t2 i32) (param $t3 i32) (result i32)
   (nop)
   (drop
    (i32.const 10)
@@ -1721,7 +1721,7 @@
  (type $none_=>_none (func))
  (memory $0 256 256)
  (data passive "hello, there!")
- (func $memory-init-load (; 0 ;)
+ (func $memory-init-load
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1737,7 +1737,7 @@
    (local.get $x)
   )
  )
- (func $memory-init-store (; 1 ;)
+ (func $memory-init-store
   (local $x i32)
   (local.set $x
    (block $block (result i32)
@@ -1757,7 +1757,7 @@
    (local.get $x)
   )
  )
- (func $memory-copy-load (; 2 ;)
+ (func $memory-copy-load
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1773,7 +1773,7 @@
    (local.get $x)
   )
  )
- (func $memory-copy-store (; 3 ;)
+ (func $memory-copy-store
   (local $x i32)
   (local.set $x
    (block $block (result i32)
@@ -1793,7 +1793,7 @@
    (local.get $x)
   )
  )
- (func $memory-fill-load (; 4 ;)
+ (func $memory-fill-load
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1809,7 +1809,7 @@
    (local.get $x)
   )
  )
- (func $memory-fill-store (; 5 ;)
+ (func $memory-fill-store
   (local $x i32)
   (local.set $x
    (block $block (result i32)
@@ -1829,7 +1829,7 @@
    (local.get $x)
   )
  )
- (func $data-drop-load (; 6 ;)
+ (func $data-drop-load
   (local $x i32)
   (nop)
   (data.drop 0)
@@ -1839,7 +1839,7 @@
    )
   )
  )
- (func $data-drop-store (; 7 ;)
+ (func $data-drop-store
   (local $x i32)
   (local.set $x
    (block $block (result i32)
@@ -1855,7 +1855,7 @@
    (local.get $x)
   )
  )
- (func $data-drop-memory-init (; 8 ;)
+ (func $data-drop-memory-init
   (local $x i32)
   (local.set $x
    (block $block (result i32)
@@ -1875,7 +1875,7 @@
 )
 (module
  (type $none_=>_funcref (func (result funcref)))
- (func $subtype-test (; 0 ;) (result funcref)
+ (func $subtype-test (result funcref)
   (local $0 nullref)
   (local $1 funcref)
   (local $2 funcref)