1 files changed, 126 insertions, 126 deletions
diff --git a/test/passes/duplicate-function-elimination_optimize-level=1.txt b/test/passes/duplicate-function-elimination_optimize-level=1.txt
index 48547bbcf..9940ef5cf 100644
--- a/test/passes/duplicate-function-elimination_optimize-level=1.txt
+++ b/test/passes/duplicate-function-elimination_optimize-level=1.txt
@@ -1,26 +1,26 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (nop)
  )
 )
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i32.const 0)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (nop)
  )
 )
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (drop
    (i32.const 0)
   )
@@ -29,12 +29,12 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i32.const 0)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (i32.const 1)
   )
@@ -48,10 +48,10 @@
  (export "keep2" (func $keep2))
  (export "other" (func $keep2))
  (start $keep2)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (nop)
  )
- (func $caller (; 1 ;)
+ (func $caller
   (call $keep2)
   (call $keep2)
  )
@@ -59,29 +59,29 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2-after-two-passes (; 0 ;)
+ (func $keep2-after-two-passes
   (nop)
  )
- (func $keep-caller (; 1 ;)
+ (func $keep-caller
   (call $keep2-after-two-passes)
  )
- (func $other-caller (; 2 ;)
+ (func $other-caller
   (call $keep2-after-two-passes)
  )
 )
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep-4 (; 0 ;)
+ (func $keep-4
   (nop)
  )
- (func $other (; 1 ;)
+ (func $other
   (unreachable)
  )
- (func $keep-caller (; 2 ;)
+ (func $keep-caller
   (call $keep-4)
  )
- (func $other-caller (; 3 ;)
+ (func $other-caller
   (call $other)
  )
 )
@@ -90,17 +90,17 @@
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
  (memory $0 0)
- (func $keep4-similar-but-func-sig-differs (; 0 ;)
+ (func $keep4-similar-but-func-sig-differs
   (drop
    (i32.const 0)
   )
  )
- (func $other1 (; 1 ;) (param $i i32)
+ (func $other1 (param $i i32)
   (drop
    (i32.const 0)
   )
  )
- (func $other2 (; 2 ;) (result i32)
+ (func $other2 (result i32)
   (i32.const 0)
  )
 )
@@ -108,22 +108,22 @@
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
  (memory $0 0)
- (func $keep2-similar-but-func-sig-differs (; 0 ;) (param $i i32)
+ (func $keep2-similar-but-func-sig-differs (param $i i32)
   (drop
    (i32.const 0)
   )
  )
- (func $other2 (; 1 ;) (result i32)
+ (func $other2 (result i32)
   (i32.const 0)
  )
 )
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (nop)
  )
- (func $other (; 1 ;)
+ (func $other
   (nop)
   (nop)
  )
@@ -131,7 +131,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (block $block0
   )
  )
@@ -139,11 +139,11 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (block $block0
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (block $block0
    (nop)
   )
@@ -152,7 +152,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (block $block0
    (nop)
   )
@@ -161,12 +161,12 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (block $block0
    (nop)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (block $block0
    (nop)
    (unreachable)
@@ -176,12 +176,12 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (block $block0
    (nop)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (block $block0
    (unreachable)
   )
@@ -190,7 +190,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase-since-block-names-do-not-matter (; 0 ;)
+ (func $erase-since-block-names-do-not-matter
   (block $foo
   )
  )
@@ -198,7 +198,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase-since-block-names-do-not-matter (; 0 ;)
+ (func $erase-since-block-names-do-not-matter
   (block $foo
    (br $foo)
    (br_table $foo $foo
@@ -210,7 +210,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (block $foo
    (block $block
     (drop
@@ -220,7 +220,7 @@
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (block $bar
    (block $block
     (drop
@@ -234,14 +234,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (block $foo
    (br_if $foo
     (i32.const 0)
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (block $bar
    (br_if $bar
     (i32.const 1)
@@ -252,7 +252,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (block $foo
    (br_if $foo
     (i32.const 0)
@@ -263,14 +263,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (block $foo
    (br_table $foo $foo
     (i32.const 0)
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (block $bar
    (br_table $bar $bar
     (i32.const 1)
@@ -281,7 +281,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (loop $bar
    (nop)
   )
@@ -290,7 +290,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (block $foo (result i32)
     (br_table $foo $foo
@@ -300,7 +300,7 @@
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (block $bar (result i32)
     (br_table $bar $bar
@@ -314,7 +314,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (block $foo
    (block $bar
     (br_table $foo $bar
@@ -327,7 +327,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (block $foo
    (block $bar
     (br_table $foo $bar
@@ -336,7 +336,7 @@
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (block $bar
    (block $foo
     (br_table $foo $bar
@@ -349,17 +349,17 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (call $erase)
  )
 )
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2-but-in-theory-we-could-erase (; 0 ;)
+ (func $keep2-but-in-theory-we-could-erase
   (call $keep2-but-in-theory-we-could-erase)
  )
- (func $other (; 1 ;)
+ (func $other
   (call $other)
  )
 )
@@ -368,7 +368,7 @@
  (import "env" "i" (func $i))
  (import "env" "j" (func $j))
  (memory $0 0)
- (func $erase (; 2 ;)
+ (func $erase
   (call $i)
  )
 )
@@ -377,10 +377,10 @@
  (import "env" "i" (func $i))
  (import "env" "j" (func $j))
  (memory $0 0)
- (func $keep2 (; 2 ;)
+ (func $keep2
   (call $i)
  )
- (func $other (; 3 ;)
+ (func $other
   (call $j)
  )
 )
@@ -389,7 +389,7 @@
  (memory $0 0)
  (table $0 2 2 funcref)
  (elem (i32.const 0) $erase $erase)
- (func $erase (; 0 ;)
+ (func $erase
   (call_indirect (type $none_=>_none)
    (i32.const 0)
   )
@@ -400,12 +400,12 @@
  (memory $0 0)
  (table $0 2 2 funcref)
  (elem (i32.const 0) $keep2 $other)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (call_indirect (type $none_=>_none)
    (i32.const 0)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (call_indirect (type $none_=>_none)
    (i32.const 1)
   )
@@ -416,7 +416,7 @@
  (memory $0 0)
  (table $0 2 2 funcref)
  (elem (i32.const 0) $keep2 $keep2)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (call_indirect (type $none_=>_none)
    (i32.const 0)
   )
@@ -425,7 +425,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase-even-locals-with-different-names (; 0 ;)
+ (func $erase-even-locals-with-different-names
   (local $i i32)
   (drop
    (local.get $i)
@@ -435,13 +435,13 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (local $i i32)
   (drop
    (local.get $i)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (local $j i64)
   (drop
    (local.get $j)
@@ -451,7 +451,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase-even-locals-with-different-names (; 0 ;)
+ (func $erase-even-locals-with-different-names
   (local $i i32)
   (local.set $i
    (i32.const 0)
@@ -461,13 +461,13 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (local $i i32)
   (local.set $i
    (i32.const 0)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (local $j i64)
   (local.set $j
    (i64.const 0)
@@ -477,13 +477,13 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (local $i i32)
   (local.set $i
    (i32.const 0)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (local $j i32)
   (local.set $j
    (i32.const 1)
@@ -493,7 +493,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $erase (; 0 ;)
+ (func $erase
   (drop
    (i32.load
     (i32.const 0)
@@ -509,14 +509,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i32.load offset=3
     (i32.const 0)
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (i32.load16_s offset=3
     (i32.const 0)
@@ -527,14 +527,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i32.load16_s offset=3
     (i32.const 0)
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (i32.load16_s offset=3 align=1
     (i32.const 0)
@@ -545,14 +545,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i32.load16_s
     (i32.const 0)
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (i32.load16_s offset=3
     (i32.const 0)
@@ -563,14 +563,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i32.load16_s offset=3
     (i32.const 0)
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (i32.load16_s offset=3
     (i32.const 1)
@@ -581,14 +581,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i32.load16_u offset=3
     (i32.const 0)
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (i32.load16_s offset=3
     (i32.const 0)
@@ -599,7 +599,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $erase (; 0 ;)
+ (func $erase
   (i32.store
    (i32.const 0)
    (i32.const 100)
@@ -613,13 +613,13 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (i32.store offset=3
    (i32.const 0)
    (i32.const 100)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (i32.store16 offset=3
    (i32.const 0)
    (i32.const 100)
@@ -629,13 +629,13 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (i32.store16 offset=3
    (i32.const 0)
    (i32.const 100)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (i32.store16 offset=3 align=1
    (i32.const 0)
    (i32.const 100)
@@ -645,13 +645,13 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (i32.store16
    (i32.const 0)
    (i32.const 100)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (i32.store16 offset=3
    (i32.const 0)
    (i32.const 100)
@@ -661,13 +661,13 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (i32.store16 offset=3
    (i32.const 0)
    (i32.const 100)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (i32.store16 offset=3
    (i32.const 1)
    (i32.const 100)
@@ -677,13 +677,13 @@
 (module
  (type $none_=>_none (func))
  (memory $0 10)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (i32.store16 offset=3
    (i32.const 0)
    (i32.const 100)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (i32.store16 offset=3
    (i32.const 0)
    (i32.const 101)
@@ -693,12 +693,12 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i32.const 0)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (i64.const 0)
   )
@@ -707,12 +707,12 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i32.const 0)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (f32.const 0)
   )
@@ -721,12 +721,12 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i32.const 0)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (f64.const 0)
   )
@@ -735,12 +735,12 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (i64.const 0)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (i64.const 1)
   )
@@ -749,12 +749,12 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (f32.const 0.10000000149011612)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (f32.const -0.10000000149011612)
   )
@@ -763,12 +763,12 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (f64.const 0.1)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (f64.const 0.2)
   )
@@ -777,7 +777,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (drop
    (f32.abs
     (f32.const 0)
@@ -788,14 +788,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (f32.abs
     (f32.const 0)
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (f32.abs
     (f32.const 1)
@@ -806,14 +806,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (f32.abs
     (f32.const 0)
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (f32.neg
     (f32.const 0)
@@ -824,7 +824,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (drop
    (f32.add
     (f32.const 0)
@@ -836,7 +836,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (f32.add
     (f32.const 0)
@@ -844,7 +844,7 @@
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (f32.add
     (f32.const 0)
@@ -856,7 +856,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (f32.add
     (f32.const 0)
@@ -864,7 +864,7 @@
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (f32.add
     (f32.const 1)
@@ -876,7 +876,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep2 (; 0 ;)
+ (func $keep2
   (drop
    (f32.add
     (f32.const 0)
@@ -884,7 +884,7 @@
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (f32.sub
     (f32.const 0)
@@ -896,7 +896,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (drop
    (select
     (i32.const 0)
@@ -909,7 +909,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep (; 0 ;)
+ (func $keep
   (drop
    (select
     (i32.const 0)
@@ -918,7 +918,7 @@
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (select
     (i32.const 1)
@@ -931,7 +931,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep (; 0 ;)
+ (func $keep
   (drop
    (select
     (i32.const 0)
@@ -940,7 +940,7 @@
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (select
     (i32.const 0)
@@ -953,7 +953,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep (; 0 ;)
+ (func $keep
   (drop
    (select
     (i32.const 0)
@@ -962,7 +962,7 @@
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (select
     (i32.const 0)
@@ -975,14 +975,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (return)
  )
 )
 (module
  (type $none_=>_i32 (func (result i32)))
  (memory $0 0)
- (func $erase (; 0 ;) (result i32)
+ (func $erase (result i32)
   (return
    (i32.const 0)
   )
@@ -991,12 +991,12 @@
 (module
  (type $none_=>_i32 (func (result i32)))
  (memory $0 0)
- (func $keep (; 0 ;) (result i32)
+ (func $keep (result i32)
   (return
    (i32.const 0)
   )
  )
- (func $other (; 1 ;) (result i32)
+ (func $other (result i32)
   (return
    (i32.const 1)
   )
@@ -1005,7 +1005,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (drop
    (memory.size)
   )
@@ -1014,7 +1014,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $erase (; 0 ;)
+ (func $erase
   (drop
    (memory.grow
     (i32.const 10)
@@ -1025,14 +1025,14 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep (; 0 ;)
+ (func $keep
   (drop
    (memory.grow
     (i32.const 10)
    )
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (memory.grow
     (i32.const 11)
@@ -1043,12 +1043,12 @@
 (module
  (type $none_=>_none (func))
  (memory $0 0)
- (func $keep (; 0 ;)
+ (func $keep
   (drop
    (memory.size)
   )
  )
- (func $other (; 1 ;)
+ (func $other
   (drop
    (memory.grow
     (i32.const 10)