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.

1 files changed, 53 insertions, 53 deletions

diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise
index 584e46d9f..afbaea82a 100644
--- a/test/unit.fromasm.imprecise
+++ b/test/unit.fromasm.imprecise
@@ -83,10 +83,10 @@
  (export "relocatableAndModules" (func $relocatableAndModules))
  (export "exported_f32_user" (func $exported_f32_user))
  (export "keepAlive" (func $keepAlive))
- (func $big_negative (; 7 ;) (; has Stack IR ;)
+ (func $big_negative (; has Stack IR ;)
   (nop)
  )
- (func $importedDoubles (; 8 ;) (; has Stack IR ;) (result f64)
+ (func $importedDoubles (; has Stack IR ;) (result f64)
   (if
    (i32.gt_s
     (global.get $Int)
@@ -98,7 +98,7 @@
   )
   (f64.const 1.2)
  )
- (func $doubleCompares (; 9 ;) (; has Stack IR ;) (param $0 f64) (param $1 f64) (result f64)
+ (func $doubleCompares (; has Stack IR ;) (param $0 f64) (param $1 f64) (result f64)
   (if
    (f64.gt
     (local.get $0)
@@ -137,15 +137,15 @@
   )
   (local.get $1)
  )
- (func $intOps (; 10 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $intOps (; has Stack IR ;) (param $0 i32) (result i32)
   (i32.eqz
    (local.get $0)
   )
  )
- (func $conversions (; 11 ;) (; has Stack IR ;) (param $0 i32) (param $1 f64) (param $2 f32)
+ (func $conversions (; has Stack IR ;) (param $0 i32) (param $1 f64) (param $2 f32)
   (nop)
  )
- (func $switcher (; 12 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $switcher (; has Stack IR ;) (param $0 i32) (result i32)
   (block $switch
    (block $switch-case0
     (block $switch-case
@@ -202,13 +202,13 @@
   )
   (i32.const 0)
  )
- (func $frem (; 13 ;) (; has Stack IR ;) (result f64)
+ (func $frem (; has Stack IR ;) (result f64)
   (call $f64-rem
    (f64.const 5.5)
    (f64.const 1.2)
   )
  )
- (func $frem_float (; 14 ;) (; has Stack IR ;) (result f32)
+ (func $frem_float (; has Stack IR ;) (result f32)
   (f32.demote_f64
    (call $f64-rem
     (f64.const 5.5)
@@ -216,34 +216,34 @@
    )
   )
  )
- (func $big_uint_div_u (; 15 ;) (; has Stack IR ;) (result i32)
+ (func $big_uint_div_u (; has Stack IR ;) (result i32)
   (i32.const 2147483647)
  )
- (func $trapping_sint_div_s (; 16 ;) (; has Stack IR ;) (result i32)
+ (func $trapping_sint_div_s (; has Stack IR ;) (result i32)
   (i32.div_s
    (i32.const -2147483648)
    (i32.const -1)
   )
  )
- (func $fr (; 17 ;) (; has Stack IR ;) (param $0 f32)
+ (func $fr (; has Stack IR ;) (param $0 f32)
   (nop)
  )
- (func $negZero (; 18 ;) (; has Stack IR ;) (result f64)
+ (func $negZero (; has Stack IR ;) (result f64)
   (f64.const -0)
  )
- (func $neg (; 19 ;) (; has Stack IR ;)
+ (func $neg (; has Stack IR ;)
   (call_indirect (type $f32_=>_none)
    (f32.const -0)
    (i32.const 9)
   )
  )
- (func $cneg (; 20 ;) (; has Stack IR ;) (param $0 f32)
+ (func $cneg (; has Stack IR ;) (param $0 f32)
   (call_indirect (type $f32_=>_none)
    (local.get $0)
    (i32.const 9)
   )
  )
- (func $smallCompare (; 21 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
+ (func $smallCompare (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
   (if (result i32)
    (i32.lt_u
     (local.tee $0
@@ -268,13 +268,13 @@
    (local.get $0)
   )
  )
- (func $cneg_nosemicolon (; 22 ;) (; has Stack IR ;)
+ (func $cneg_nosemicolon (; has Stack IR ;)
   (call_indirect (type $i32_=>_none)
    (i32.const 1)
    (i32.const 17)
   )
  )
- (func $forLoop (; 23 ;) (; has Stack IR ;)
+ (func $forLoop (; has Stack IR ;)
   (local $0 i32)
   (local.set $0
    (i32.const 1)
@@ -300,10 +300,10 @@
    )
   )
  )
- (func $ceiling_32_64 (; 24 ;) (; has Stack IR ;) (param $0 f32) (param $1 f64)
+ (func $ceiling_32_64 (; has Stack IR ;) (param $0 f32) (param $1 f64)
   (nop)
  )
- (func $aborts (; 25 ;) (; has Stack IR ;)
+ (func $aborts (; has Stack IR ;)
   (drop
    (call $abort
     (f64.const 0)
@@ -332,7 +332,7 @@
    )
   )
  )
- (func $continues (; 26 ;) (; has Stack IR ;)
+ (func $continues (; has Stack IR ;)
   (loop $while-in
    (call $print
     (i32.const 1)
@@ -351,10 +351,10 @@
    (br $while-in)
   )
  )
- (func $bitcasts (; 27 ;) (; has Stack IR ;) (param $0 i32) (param $1 f32)
+ (func $bitcasts (; has Stack IR ;) (param $0 i32) (param $1 f32)
   (nop)
  )
- (func $recursiveBlockMerging (; 28 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $recursiveBlockMerging (; has Stack IR ;) (param $0 i32) (result i32)
   (drop
    (call $lb
     (i32.add
@@ -429,7 +429,7 @@
    )
   )
  )
- (func $lb (; 29 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $lb (; has Stack IR ;) (param $0 i32) (result i32)
   (i32.store
    (local.get $0)
    (i32.add
@@ -439,7 +439,7 @@
   )
   (i32.const 0)
  )
- (func $zeroInit (; 30 ;) (; has Stack IR ;) (param $0 i32)
+ (func $zeroInit (; has Stack IR ;) (param $0 i32)
   (local $1 i32)
   (if
    (i32.eq
@@ -465,7 +465,7 @@
    )
   )
  )
- (func $phi (; 31 ;) (; has Stack IR ;) (result i32)
+ (func $phi (; has Stack IR ;) (result i32)
   (block $do-once (result i32)
    (drop
     (br_if $do-once
@@ -478,7 +478,7 @@
    (i32.const 1)
   )
  )
- (func $smallIf (; 32 ;) (; has Stack IR ;)
+ (func $smallIf (; has Stack IR ;)
   (if
    (call $return_int)
    (drop
@@ -488,7 +488,7 @@
    )
   )
  )
- (func $dropCall (; 33 ;) (; has Stack IR ;) (result i32)
+ (func $dropCall (; has Stack IR ;) (result i32)
   (if
    (call $return_int)
    (block
@@ -509,7 +509,7 @@
   )
   (call $phi)
  )
- (func $useGlobalSet (; 34 ;) (; has Stack IR ;) (result i32)
+ (func $useGlobalSet (; has Stack IR ;) (result i32)
   (global.set $Int
    (i32.const 10)
   )
@@ -521,13 +521,13 @@
   )
   (i32.const 30)
  )
- (func $usesGlobalSet2 (; 35 ;) (; has Stack IR ;) (result i32)
+ (func $usesGlobalSet2 (; has Stack IR ;) (result i32)
   (global.set $Int
    (i32.const 40)
   )
   (i32.const 50)
  )
- (func $breakThroughMany (; 36 ;) (; has Stack IR ;) (param $0 i32)
+ (func $breakThroughMany (; has Stack IR ;) (param $0 i32)
   (if
    (local.get $0)
    (loop $while-in
@@ -543,7 +543,7 @@
    )
   )
  )
- (func $ifChainEmpty (; 37 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $ifChainEmpty (; has Stack IR ;) (param $0 i32) (result i32)
   (if
    (i32.eq
     (local.get $0)
@@ -555,12 +555,12 @@
   )
   (i32.const 0)
  )
- (func $heap8NoShift (; 38 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $heap8NoShift (; has Stack IR ;) (param $0 i32) (result i32)
   (i32.load8_s
    (local.get $0)
   )
  )
- (func $conditionalTypeFun (; 39 ;) (; has Stack IR ;)
+ (func $conditionalTypeFun (; has Stack IR ;)
   (drop
    (if (result i32)
     (call $return_int)
@@ -586,7 +586,7 @@
    )
   )
  )
- (func $loadSigned (; 40 ;) (; has Stack IR ;) (param $0 i32)
+ (func $loadSigned (; has Stack IR ;) (param $0 i32)
   (call $loadSigned
    (i32.load8_s
     (local.get $0)
@@ -652,10 +652,10 @@
    )
   )
  )
- (func $w (; 41 ;) (; has Stack IR ;) (result f64)
+ (func $w (; has Stack IR ;) (result f64)
   (f64.const 0)
  )
- (func $globalOpts (; 42 ;) (; has Stack IR ;)
+ (func $globalOpts (; has Stack IR ;)
   (local $0 i32)
   (i32.store8
    (i32.const 13)
@@ -685,7 +685,7 @@
    (local.get $0)
   )
  )
- (func $dropCallImport (; 43 ;) (; has Stack IR ;)
+ (func $dropCallImport (; has Stack IR ;)
   (if
    (call $return_int)
    (drop
@@ -693,7 +693,7 @@
    )
   )
  )
- (func $loophi (; 44 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32)
+ (func $loophi (; has Stack IR ;) (param $0 i32) (param $1 i32)
   (loop $while-in
    (block $while-out
     (call $loophi
@@ -721,7 +721,7 @@
    )
   )
  )
- (func $loophi2 (; 45 ;) (; has Stack IR ;) (result i32)
+ (func $loophi2 (; has Stack IR ;) (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -755,7 +755,7 @@
   )
   (local.get $1)
  )
- (func $loophi2b (; 46 ;) (; has Stack IR ;) (result i32)
+ (func $loophi2b (; has Stack IR ;) (result i32)
   (local $0 i32)
   (local $1 i32)
   (loop $label$continue$L7
@@ -788,7 +788,7 @@
   )
   (local.get $0)
  )
- (func $relooperJumpThreading (; 47 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $relooperJumpThreading (; has Stack IR ;) (param $0 i32) (result i32)
   (block $__rjto$0
    (block $__rjti$0
     (if
@@ -957,7 +957,7 @@
   )
   (local.get $0)
  )
- (func $relooperJumpThreading__ZN4game14preloadweaponsEv (; 48 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32)
+ (func $relooperJumpThreading__ZN4game14preloadweaponsEv (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32)
   (loop $while-in
    (block $__rjti$1
     (if
@@ -982,7 +982,7 @@
    (br $while-in)
   )
  )
- (func $relooperJumpThreading_irreducible (; 49 ;) (; has Stack IR ;) (param $0 i32)
+ (func $relooperJumpThreading_irreducible (; has Stack IR ;) (param $0 i32)
   (local $1 i32)
   (if
    (i32.eq
@@ -1034,7 +1034,7 @@
    )
   )
  )
- (func $__Z12multi_varargiz (; 50 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
+ (func $__Z12multi_varargiz (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
   (if
    (local.get $3)
    (loop $while-in
@@ -1051,10 +1051,10 @@
    )
   )
  )
- (func $jumpThreadDrop (; 51 ;) (; has Stack IR ;) (result i32)
+ (func $jumpThreadDrop (; has Stack IR ;) (result i32)
   (call $return_int)
  )
- (func $dropIgnoredImportInIf (; 52 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $dropIgnoredImportInIf (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32)
   (if
    (local.get $0)
    (drop
@@ -1064,7 +1064,7 @@
    )
   )
  )
- (func $dropIgnoredImportsInIf (; 53 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $dropIgnoredImportsInIf (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32)
   (drop
    (if (result i32)
     (local.get $0)
@@ -1077,7 +1077,7 @@
    )
   )
  )
- (func $store_fround (; 54 ;) (; has Stack IR ;) (param $0 i32)
+ (func $store_fround (; has Stack IR ;) (param $0 i32)
   (f64.store
    (i32.const 80)
    (f64.promote_f32
@@ -1087,7 +1087,7 @@
    )
   )
  )
- (func $relocatableAndModules (; 55 ;) (; has Stack IR ;) (result i32)
+ (func $relocatableAndModules (; has Stack IR ;) (result i32)
   (call_indirect (type $none_=>_none)
    (i32.const 10)
   )
@@ -1100,10 +1100,10 @@
    (i32.const 30)
   )
  )
- (func $exported_f32_user (; 56 ;) (; has Stack IR ;) (param $0 i32) (param $1 f32) (param $2 f64) (result f32)
+ (func $exported_f32_user (; has Stack IR ;) (param $0 i32) (param $1 f32) (param $2 f64) (result f32)
   (local.get $1)
  )
- (func $keepAlive (; 57 ;) (; has Stack IR ;)
+ (func $keepAlive (; has Stack IR ;)
   (call_indirect (type $i32_=>_none)
    (i32.const 0)
    (i32.const 17)
@@ -1136,10 +1136,10 @@
    )
   )
  )
- (func $vi (; 58 ;) (; has Stack IR ;) (param $0 i32)
+ (func $vi (; has Stack IR ;) (param $0 i32)
   (nop)
  )
- (func $ii (; 59 ;) (; has Stack IR ;) (param $0 i32) (result i32)
+ (func $ii (; has Stack IR ;) (param $0 i32) (result i32)
   (local.get $0)
  )
 )