Remove function index printing (#2742)

`BinaryIndexes` was only used in two places (Print.cpp and
wasm-binary.h), so it didn't seem to be a great fit for
module-utils.h. This change moves it to wasm-binary.h and removes its
usage in Print.cpp. This means that function indexes are no longer
printed, but those were of limited utility and were the source of
annoying noise when updating tests, anyway.

11 files changed, 66 insertions, 66 deletions

diff --git a/test/binaryen.js/atomics.js.txt b/test/binaryen.js/atomics.js.txt
index be62678e2..a58647617 100644
--- a/test/binaryen.js/atomics.js.txt
+++ b/test/binaryen.js/atomics.js.txt
@@ -1,7 +1,7 @@
 (module
  (type $none_=>_none (func))
  (memory $0 (shared 1 1))
- (func $main (; 0 ;)
+ (func $main
   (i32.atomic.store
    (i32.const 0)
    (i32.atomic.load
diff --git a/test/binaryen.js/debug-info.js.txt b/test/binaryen.js/debug-info.js.txt
index 3d83e46e5..4cbe177b8 100644
--- a/test/binaryen.js/debug-info.js.txt
+++ b/test/binaryen.js/debug-info.js.txt
@@ -4,7 +4,7 @@ debugInfo=false
  (type $none_=>_none (func))
  (memory $0 0)
  (export "test" (func $0))
- (func $0 (; 0 ;)
+ (func $0
   (nop)
  )
 )
@@ -15,7 +15,7 @@ debugInfo=true
  (type $none_=>_none (func))
  (memory $0 0)
  (export "test" (func $test))
- (func $test (; 0 ;)
+ (func $test
   (nop)
  )
 )
@@ -26,7 +26,7 @@ debugInfo=false
  (type $none_=>_none (func))
  (memory $0 0)
  (export "test" (func $0))
- (func $0 (; 0 ;)
+ (func $0
   (nop)
  )
 )
diff --git a/test/binaryen.js/exception-handling.js.txt b/test/binaryen.js/exception-handling.js.txt
index 11486ab11..99f8501a9 100644
--- a/test/binaryen.js/exception-handling.js.txt
+++ b/test/binaryen.js/exception-handling.js.txt
@@ -2,7 +2,7 @@
  (type $none_=>_none (func))
  (type $i32_=>_none (func (param i32)))
  (event $e (attr 0) (param i32))
- (func $test (; 0 ;)
+ (func $test
   (local $0 exnref)
   (try
    (throw $e
diff --git a/test/binaryen.js/hello-world.js.txt b/test/binaryen.js/hello-world.js.txt
index 3ce5163ea..764ac8519 100644
--- a/test/binaryen.js/hello-world.js.txt
+++ b/test/binaryen.js/hello-world.js.txt
@@ -1,7 +1,7 @@
 (module
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (export "adder" (func $adder))
- (func $adder (; 0 ;) (param $0 i32) (param $1 i32) (result i32)
+ (func $adder (param $0 i32) (param $1 i32) (result i32)
   (return
    (i32.add
     (local.get $0)
@@ -16,7 +16,7 @@ optimized:
 (module
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (export "adder" (func $adder))
- (func $adder (; 0 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
+ (func $adder (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
   (i32.add
    (local.get $0)
    (local.get $1)
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
index 647d04004..8e032ded8 100644
--- a/test/binaryen.js/kitchen-sink.js.txt
+++ b/test/binaryen.js/kitchen-sink.js.txt
@@ -1940,7 +1940,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
  (export "a-event-exp" (event $a-event))
  (export "mem" (memory $0))
  (start $starter)
- (func "$kitchen()sinker" (; 1 ;) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
+ (func "$kitchen()sinker" (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
   (local $4 i32)
   (local $5 exnref)
   (block $the-body (result i32)
@@ -3680,7 +3680,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
    (i32.const 42)
   )
  )
- (func $starter (; 2 ;)
+ (func $starter
   (nop)
  )
 )
@@ -3708,7 +3708,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
  (export "a-event-exp" (event $a-event))
  (export "mem" (memory $0))
  (start $starter)
- (func "$kitchen()sinker" (; 1 ;) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
+ (func "$kitchen()sinker" (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
   (local $4 i32)
   (local $5 exnref)
   (block $the-body (result i32)
@@ -5448,7 +5448,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
    (i32.const 42)
   )
  )
- (func $starter (; 2 ;)
+ (func $starter
   (nop)
  )
 )
@@ -5909,13 +5909,13 @@ raw:
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
  (import "module" "check" (func $check (param i32)))
- (func $just-one-block (; 1 ;)
+ (func $just-one-block
   (local $0 i32)
   (call $check
    (i32.const 1337)
   )
  )
- (func $two-blocks (; 2 ;)
+ (func $two-blocks
   (local $0 i32)
   (block
    (call $check
@@ -5926,7 +5926,7 @@ raw:
    )
   )
  )
- (func $two-blocks-plus-code (; 3 ;)
+ (func $two-blocks-plus-code
   (local $0 i32)
   (block
    (block
@@ -5942,7 +5942,7 @@ raw:
    )
   )
  )
- (func $loop (; 4 ;)
+ (func $loop
   (local $0 i32)
   (loop $shape$0$continue
    (block
@@ -5958,7 +5958,7 @@ raw:
    )
   )
  )
- (func $loop-plus-code (; 5 ;)
+ (func $loop-plus-code
   (local $0 i32)
   (loop $shape$0$continue
    (block
@@ -5982,7 +5982,7 @@ raw:
    )
   )
  )
- (func $split (; 6 ;)
+ (func $split
   (local $0 i32)
   (call $check
    (i32.const 0)
@@ -6001,7 +6001,7 @@ raw:
    )
   )
  )
- (func $split-plus-code (; 7 ;)
+ (func $split-plus-code
   (local $0 i32)
   (call $check
    (i32.const 0)
@@ -6030,7 +6030,7 @@ raw:
    )
   )
  )
- (func $if (; 8 ;)
+ (func $if
   (local $0 i32)
   (block $block$3$break
    (call $check
@@ -6055,7 +6055,7 @@ raw:
    )
   )
  )
- (func $if-plus-code (; 9 ;)
+ (func $if-plus-code
   (local $0 i32)
   (block $block$3$break
    (call $check
@@ -6093,7 +6093,7 @@ raw:
    )
   )
  )
- (func $if-else (; 10 ;)
+ (func $if-else
   (local $0 i32)
   (block $block$4$break
    (call $check
@@ -6125,7 +6125,7 @@ raw:
    )
   )
  )
- (func $loop-tail (; 11 ;)
+ (func $loop-tail
   (local $0 i32)
   (block $block$3$break
    (loop $shape$0$continue
@@ -6150,7 +6150,7 @@ raw:
    )
   )
  )
- (func $nontrivial-loop-plus-phi-to-head (; 12 ;)
+ (func $nontrivial-loop-plus-phi-to-head
   (local $0 i32)
   (block $block$2$break
    (call $check
@@ -6237,7 +6237,7 @@ raw:
    )
   )
  )
- (func $switch (; 13 ;)
+ (func $switch
   (local $0 i32)
   (call $check
    (i32.const 0)
@@ -6281,7 +6281,7 @@ raw:
    (br $switch$1$leave)
   )
  )
- (func $duffs-device (; 14 ;)
+ (func $duffs-device
   (local $0 i32)
   (local $1 i32)
   (local $2 i64)
@@ -6356,7 +6356,7 @@ raw:
    )
   )
  )
- (func $return (; 15 ;) (result i32)
+ (func $return (result i32)
   (local $0 i32)
   (block
    (call $check
@@ -6537,7 +6537,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
  (export "a-event-exp" (event $a-event))
  (export "mem" (memory $0))
  (start $starter)
- (func "$kitchen()sinker" (; 1 ;) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
+ (func "$kitchen()sinker" (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
   (local $4 i32)
   (local $5 exnref)
   (block $the-body (result i32)
@@ -8277,7 +8277,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
    (i32.const 42)
   )
  )
- (func $starter (; 2 ;)
+ (func $starter
   (nop)
  )
 )
@@ -8303,7 +8303,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
  (export "a-event-exp" (event $a-event))
  (export "mem" (memory $0))
  (start $starter)
- (func "$kitchen()sinker" (; 1 ;) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
+ (func "$kitchen()sinker" (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
   (local $4 i32)
   (local $5 exnref)
   (block $the-body (result i32)
@@ -10043,7 +10043,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
    (i32.const 42)
   )
  )
- (func $starter (; 2 ;)
+ (func $starter
   (nop)
  )
 )
@@ -10054,13 +10054,13 @@ raw:
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
  (import "module" "check" (func $check (param i32)))
- (func $just-one-block (; 1 ;)
+ (func $just-one-block
   (local $0 i32)
   (call $check
    (i32.const 1337)
   )
  )
- (func $two-blocks (; 2 ;)
+ (func $two-blocks
   (local $0 i32)
   (block
    (call $check
@@ -10071,7 +10071,7 @@ raw:
    )
   )
  )
- (func $two-blocks-plus-code (; 3 ;)
+ (func $two-blocks-plus-code
   (local $0 i32)
   (block
    (block
@@ -10087,7 +10087,7 @@ raw:
    )
   )
  )
- (func $loop (; 4 ;)
+ (func $loop
   (local $0 i32)
   (loop $shape$0$continue
    (block
@@ -10103,7 +10103,7 @@ raw:
    )
   )
  )
- (func $loop-plus-code (; 5 ;)
+ (func $loop-plus-code
   (local $0 i32)
   (loop $shape$0$continue
    (block
@@ -10127,7 +10127,7 @@ raw:
    )
   )
  )
- (func $split (; 6 ;)
+ (func $split
   (local $0 i32)
   (call $check
    (i32.const 0)
@@ -10146,7 +10146,7 @@ raw:
    )
   )
  )
- (func $split-plus-code (; 7 ;)
+ (func $split-plus-code
   (local $0 i32)
   (call $check
    (i32.const 0)
@@ -10175,7 +10175,7 @@ raw:
    )
   )
  )
- (func $if (; 8 ;)
+ (func $if
   (local $0 i32)
   (block $block$3$break
    (call $check
@@ -10200,7 +10200,7 @@ raw:
    )
   )
  )
- (func $if-plus-code (; 9 ;)
+ (func $if-plus-code
   (local $0 i32)
   (block $block$3$break
    (call $check
@@ -10238,7 +10238,7 @@ raw:
    )
   )
  )
- (func $if-else (; 10 ;)
+ (func $if-else
   (local $0 i32)
   (block $block$4$break
    (call $check
@@ -10270,7 +10270,7 @@ raw:
    )
   )
  )
- (func $loop-tail (; 11 ;)
+ (func $loop-tail
   (local $0 i32)
   (block $block$3$break
    (loop $shape$0$continue
@@ -10295,7 +10295,7 @@ raw:
    )
   )
  )
- (func $nontrivial-loop-plus-phi-to-head (; 12 ;)
+ (func $nontrivial-loop-plus-phi-to-head
   (local $0 i32)
   (block $block$2$break
    (call $check
@@ -10382,7 +10382,7 @@ raw:
    )
   )
  )
- (func $switch (; 13 ;)
+ (func $switch
   (local $0 i32)
   (call $check
    (i32.const 0)
@@ -10426,7 +10426,7 @@ raw:
    (br $switch$1$leave)
   )
  )
- (func $duffs-device (; 14 ;)
+ (func $duffs-device
   (local $0 i32)
   (local $1 i32)
   (local $2 i64)
@@ -10501,7 +10501,7 @@ raw:
    )
   )
  )
- (func $return (; 15 ;) (result i32)
+ (func $return (result i32)
   (local $0 i32)
   (block
    (call $check
@@ -10524,7 +10524,7 @@ module loaded from binary form:
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (global $global$0 i32 (i32.const 3))
  (event $event$0 (attr 0) (param i32 i32))
- (func $adder (; 0 ;) (param $0 i32) (param $1 i32) (result i32)
+ (func $adder (param $0 i32) (param $1 i32) (result i32)
   (i32.add
    (local.get $0)
    (local.get $1)
@@ -10537,7 +10537,7 @@ module loaded from binary form:
  (type $i32_=>_none (func (param i32)))
  (import "spectest" "print" (func $print-i32 (param i32)))
  (start $starter)
- (func $starter (; 1 ;)
+ (func $starter
   (call $print-i32
    (i32.const 1234)
   )
@@ -10547,7 +10547,7 @@ module loaded from binary form:
 1234 : i32
 (module
  (type $none_=>_none (func))
- (func $func (; 0 ;)
+ (func $func
   (local $0 i32)
   (local.set $0
    (i64.const 1234)
@@ -10566,7 +10566,7 @@ test_parsing text:
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (global $a-global i32 (i32.const 3))
  (event $a-event (attr 0) (param i32))
- (func $adder (; 0 ;) (param $0 i32) (param $1 i32) (result i32)
+ (func $adder (param $0 i32) (param $1 i32) (result i32)
   (i32.add
    (local.get $0)
    (local.get $1)
@@ -10580,7 +10580,7 @@ module loaded from text form:
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (global $a-global i32 (i32.const 3))
  (event $a-event (attr 0) (param i32))
- (func $ADD_ER (; 0 ;) (param $0 i32) (param $1 i32) (result i32)
+ (func $ADD_ER (param $0 i32) (param $1 i32) (result i32)
   (i32.add
    (local.get $0)
    (local.get $1)
@@ -10601,13 +10601,13 @@ sizeof Literal: 24
  (export "export1" (func $fn1))
  (export "export2" (func $fn2))
  (export "mem" (memory $0))
- (func $fn0 (; 0 ;)
+ (func $fn0
   (nop)
  )
- (func $fn1 (; 1 ;)
+ (func $fn1
   (nop)
  )
- (func $fn2 (; 2 ;)
+ (func $fn2
   (nop)
  )
 )
diff --git a/test/binaryen.js/low-memory-unused.js.txt b/test/binaryen.js/low-memory-unused.js.txt
index 13850128c..037fa824d 100644
--- a/test/binaryen.js/low-memory-unused.js.txt
+++ b/test/binaryen.js/low-memory-unused.js.txt
@@ -17,7 +17,7 @@
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 1)
  (export "test" (func $test))
- (func $test (; 0 ;) (param $0 i32) (result i32)
+ (func $test (param $0 i32) (result i32)
   (i32.load
    (i32.add
     (local.get $0)
@@ -32,7 +32,7 @@
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 1)
  (export "test" (func $test))
- (func $test (; 0 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $test (; has Stack IR ;) (param $0 i32) (result i32)
   (i32.load
    (i32.add
     (local.get $0)
@@ -66,7 +66,7 @@ int main() {
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 1)
  (export "test" (func $test))
- (func $test (; 0 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $test (; has Stack IR ;) (param $0 i32) (result i32)
   (i32.load offset=128
    (local.get $0)
   )
diff --git a/test/binaryen.js/optimize-levels.js.txt b/test/binaryen.js/optimize-levels.js.txt
index 9170fe8fc..d318ad588 100644
--- a/test/binaryen.js/optimize-levels.js.txt
+++ b/test/binaryen.js/optimize-levels.js.txt
@@ -19,7 +19,7 @@
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 0)
  (export "test" (func $test))
- (func $test (; 0 ;) (param $0 i32) (result i32)
+ (func $test (param $0 i32) (result i32)
   (block $block (result i32)
    (if (result i32)
     (local.get $0)
@@ -36,7 +36,7 @@ shrinkLevel=1
 (module
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (export "test" (func $test))
- (func $test (; 0 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $test (; has Stack IR ;) (param $0 i32) (result i32)
   (select
    (local.get $0)
    (i32.const 0)
@@ -51,7 +51,7 @@ shrinkLevel=0
 (module
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (export "test" (func $test))
- (func $test (; 0 ;) (param $0 i32) (result i32)
+ (func $test (param $0 i32) (result i32)
   (select
    (local.get $0)
    (i32.const 0)
@@ -66,7 +66,7 @@ shrinkLevel=1
 (module
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (export "test" (func $test))
- (func $test (; 0 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $test (; has Stack IR ;) (param $0 i32) (result i32)
   (select
    (local.get $0)
    (i32.const 0)
diff --git a/test/binaryen.js/push-pop.js.txt b/test/binaryen.js/push-pop.js.txt
index 00fbd58b9..e5d5437f9 100644
--- a/test/binaryen.js/push-pop.js.txt
+++ b/test/binaryen.js/push-pop.js.txt
@@ -1,6 +1,6 @@
 (module
  (type $none_=>_none (func))
- (func $func (; 0 ;)
+ (func $func
   (push
    (i32.pop)
   )
diff --git a/test/binaryen.js/reloc.js.txt b/test/binaryen.js/reloc.js.txt
index aa7bfc66e..729f29b9d 100644
--- a/test/binaryen.js/reloc.js.txt
+++ b/test/binaryen.js/reloc.js.txt
@@ -6,7 +6,7 @@
  (data (global.get $memory_base) "data data")
  (table $0 1 funcref)
  (elem (global.get $table_base) $func $func)
- (func $func (; 0 ;)
+ (func $func
   (nop)
  )
 )
diff --git a/test/binaryen.js/sieve.js.txt b/test/binaryen.js/sieve.js.txt
index 04650a35a..7a4223cd8 100644
--- a/test/binaryen.js/sieve.js.txt
+++ b/test/binaryen.js/sieve.js.txt
@@ -2,7 +2,7 @@
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 1 100)
  (export "sieve" (func $sieve))
- (func $sieve (; 0 ;) (param $0 i32) (result i32)
+ (func $sieve (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.lt_u
@@ -60,7 +60,7 @@ optimized:
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 1 100)
  (export "sieve" (func $sieve))
- (func $sieve (; 0 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $sieve (; has Stack IR ;) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.lt_u
diff --git a/test/binaryen.js/stackir.js.txt b/test/binaryen.js/stackir.js.txt
index 0dcd7cf0a..60dabce98 100644
--- a/test/binaryen.js/stackir.js.txt
+++ b/test/binaryen.js/stackir.js.txt
@@ -21,7 +21,7 @@
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 0)
  (export "test" (func $test))
- (func $test (; 0 ;) (param $0 i32) (result i32)
+ (func $test (param $0 i32) (result i32)
   block $block0 (result i32)
    local.get $0
    if (result i32)
@@ -38,7 +38,7 @@
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 0)
  (export "test" (func $test))
- (func $test (; 0 ;) (param $0 i32) (result i32)
+ (func $test (param $0 i32) (result i32)
   local.get $0
   if (result i32)
    local.get $0