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, 74 insertions, 74 deletions

diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts
index 619dc88c1..fbd48815a 100644
--- a/test/unit.fromasm.imprecise.no-opts
+++ b/test/unit.fromasm.imprecise.no-opts
@@ -97,7 +97,7 @@
  (export "relocatableAndModules" (func $relocatableAndModules))
  (export "exported_f32_user" (func $exported_f32_user))
  (export "keepAlive" (func $keepAlive))
- (func $big_negative (; 7 ;)
+ (func $big_negative
   (local $temp f64)
   (local.set $temp
    (f64.const -2147483648)
@@ -115,7 +115,7 @@
    (f64.const -0.039625)
   )
  )
- (func $importedDoubles (; 8 ;) (result f64)
+ (func $importedDoubles (result f64)
   (local $temp f64)
   (local.set $temp
    (f64.add
@@ -155,7 +155,7 @@
    (f64.const 1.2)
   )
  )
- (func $doubleCompares (; 9 ;) (param $x f64) (param $y f64) (result f64)
+ (func $doubleCompares (param $x f64) (param $y f64) (result f64)
   (local $t f64)
   (local $Int f64)
   (local $Double i32)
@@ -205,14 +205,14 @@
    (local.get $y)
   )
  )
- (func $intOps (; 10 ;) (param $x i32) (result i32)
+ (func $intOps (param $x i32) (result i32)
   (return
    (i32.eqz
     (local.get $x)
    )
   )
  )
- (func $hexLiterals (; 11 ;)
+ (func $hexLiterals
   (local $i i32)
   (local.set $i
    (i32.add
@@ -224,7 +224,7 @@
    )
   )
  )
- (func $conversions (; 12 ;) (param $i i32) (param $d f64) (param $f f32)
+ (func $conversions (param $i i32) (param $d f64) (param $f f32)
   (local.set $i
    (i32.trunc_f64_s
     (local.get $d)
@@ -246,7 +246,7 @@
    )
   )
  )
- (func $seq (; 13 ;)
+ (func $seq
   (local $J f64)
   (local.set $J
    (f64.sub
@@ -265,7 +265,7 @@
    )
   )
  )
- (func $switcher (; 14 ;) (param $x i32) (result i32)
+ (func $switcher (param $x i32) (result i32)
   (local $waka i32)
   (block $switch
    (block $switch-case0
@@ -387,12 +387,12 @@
    (i32.const 0)
   )
  )
- (func $blocker (; 15 ;)
+ (func $blocker
   (block $label$break$L
    (br $label$break$L)
   )
  )
- (func $frem (; 16 ;) (result f64)
+ (func $frem (result f64)
   (return
    (call $f64-rem
     (f64.const 5.5)
@@ -400,7 +400,7 @@
    )
   )
  )
- (func $frem_float (; 17 ;) (result f32)
+ (func $frem_float (result f32)
   (return
    (f32.demote_f64
     (call $f64-rem
@@ -414,7 +414,7 @@
    )
   )
  )
- (func $big_uint_div_u (; 18 ;) (result i32)
+ (func $big_uint_div_u (result i32)
   (local $x i32)
   (local.set $x
    (i32.and
@@ -429,7 +429,7 @@
    (local.get $x)
   )
  )
- (func $trapping_sint_div_s (; 19 ;) (result i32)
+ (func $trapping_sint_div_s (result i32)
   (local $x i32)
   (local.set $x
    (i32.div_s
@@ -441,7 +441,7 @@
    (local.get $x)
   )
  )
- (func $fr (; 20 ;) (param $x f32)
+ (func $fr (param $x f32)
   (local $y f32)
   (local $z f64)
   (drop
@@ -465,12 +465,12 @@
    (f32.const 0)
   )
  )
- (func $negZero (; 21 ;) (result f64)
+ (func $negZero (result f64)
   (return
    (f64.const -0)
   )
  )
- (func $abs (; 22 ;)
+ (func $abs
   (local $x i32)
   (local $y f64)
   (local $z f32)
@@ -504,7 +504,7 @@
    )
   )
  )
- (func $minmax (; 23 ;)
+ (func $minmax
   (local $x f64)
   (local $y f64)
   (local $z f32)
@@ -534,7 +534,7 @@
    )
   )
  )
- (func $neg (; 24 ;)
+ (func $neg
   (local $x f32)
   (local.set $x
    (f32.neg
@@ -552,7 +552,7 @@
    )
   )
  )
- (func $cneg (; 25 ;) (param $x f32)
+ (func $cneg (param $x f32)
   (call_indirect (type $f32_=>_none)
    (local.get $x)
    (i32.add
@@ -564,7 +564,7 @@
    )
   )
  )
- (func $___syscall_ret (; 26 ;)
+ (func $___syscall_ret
   (local $$0 i32)
   (drop
    (i32.gt_u
@@ -573,7 +573,7 @@
    )
   )
  )
- (func $smallCompare (; 27 ;) (param $i i32) (param $j i32) (result i32)
+ (func $smallCompare (param $i i32) (param $j i32) (result i32)
   (if
    (i32.lt_s
     (local.get $i)
@@ -602,7 +602,7 @@
    (local.get $i)
   )
  )
- (func $cneg_nosemicolon (; 28 ;)
+ (func $cneg_nosemicolon
   (call_indirect (type $i32_=>_none)
    (i32.const 1)
    (i32.add
@@ -614,7 +614,7 @@
    )
   )
  )
- (func $forLoop (; 29 ;)
+ (func $forLoop
   (local $i i32)
   (local.set $i
    (i32.const 1)
@@ -643,7 +643,7 @@
    )
   )
  )
- (func $ceiling_32_64 (; 30 ;) (param $u f32) (param $B f64)
+ (func $ceiling_32_64 (param $u f32) (param $B f64)
   (local $temp f32)
   (local.set $temp
    (f32.demote_f64
@@ -663,7 +663,7 @@
    )
   )
  )
- (func $aborts (; 31 ;)
+ (func $aborts
   (drop
    (call $abort
     (f64.const 0)
@@ -694,7 +694,7 @@
    )
   )
  )
- (func $continues (; 32 ;)
+ (func $continues
   (loop $while-in
    (block $while-out
     (call $print
@@ -718,7 +718,7 @@
    )
   )
  )
- (func $bitcasts (; 33 ;) (param $i i32) (param $f f32)
+ (func $bitcasts (param $i i32) (param $f f32)
   (local $d f64)
   (drop
    (f32.reinterpret_i32
@@ -745,7 +745,7 @@
    )
   )
  )
- (func $recursiveBlockMerging (; 34 ;) (param $x i32) (result i32)
+ (func $recursiveBlockMerging (param $x i32) (result i32)
   (drop
    (call $lb
     (i32.add
@@ -890,7 +890,7 @@
    (local.get $x)
   )
  )
- (func $lb (; 35 ;) (param $a i32) (result i32)
+ (func $lb (param $a i32) (result i32)
   (i32.store
    (local.get $a)
    (i32.add
@@ -905,17 +905,17 @@
    (i32.const 0)
   )
  )
- (func $forgetMe (; 36 ;)
+ (func $forgetMe
   (drop
    (f64.const 123.456)
   )
  )
- (func $exportMe (; 37 ;)
+ (func $exportMe
   (drop
    (f64.const -3.14159)
   )
  )
- (func $zeroInit (; 38 ;) (param $x i32)
+ (func $zeroInit (param $x i32)
   (local $y i32)
   (if
    (call $lb
@@ -945,7 +945,7 @@
    )
   )
  )
- (func $phi (; 39 ;) (result i32)
+ (func $phi (result i32)
   (local $x i32)
   (block $do-once
    (block
@@ -969,7 +969,7 @@
    (local.get $x)
   )
  )
- (func $smallIf (; 40 ;)
+ (func $smallIf
   (block $do-once
    (if
     (call $return_int)
@@ -983,7 +983,7 @@
    (nop)
   )
  )
- (func $dropCall (; 41 ;) (result i32)
+ (func $dropCall (result i32)
   (if
    (call $return_int)
    (block
@@ -1006,7 +1006,7 @@
    (call $phi)
   )
  )
- (func $useGlobalSet (; 42 ;) (result i32)
+ (func $useGlobalSet (result i32)
   (local $x i32)
   (local.set $x
    (block (result i32)
@@ -1028,7 +1028,7 @@
    )
   )
  )
- (func $usesGlobalSet2 (; 43 ;) (result i32)
+ (func $usesGlobalSet2 (result i32)
   (return
    (block (result i32)
     (block
@@ -1043,7 +1043,7 @@
    )
   )
  )
- (func $breakThroughMany (; 44 ;) (param $$s i32)
+ (func $breakThroughMany (param $$s i32)
   (block $label$break$L1
    (if
     (local.get $$s)
@@ -1068,7 +1068,7 @@
    (nop)
   )
  )
- (func $ifChainEmpty (; 45 ;) (param $label i32) (result i32)
+ (func $ifChainEmpty (param $label i32) (result i32)
   (if
    (i32.eq
     (local.get $label)
@@ -1089,14 +1089,14 @@
    (i32.const 0)
   )
  )
- (func $heap8NoShift (; 46 ;) (param $x i32) (result i32)
+ (func $heap8NoShift (param $x i32) (result i32)
   (return
    (i32.load8_s
     (local.get $x)
    )
   )
  )
- (func $conditionalTypeFun (; 47 ;)
+ (func $conditionalTypeFun
   (local $x i32)
   (local $y f64)
   (local.set $x
@@ -1124,7 +1124,7 @@
    )
   )
  )
- (func $loadSigned (; 48 ;) (param $x i32)
+ (func $loadSigned (param $x i32)
   (call $loadSigned
    (i32.shr_s
     (i32.shl
@@ -1214,15 +1214,15 @@
    )
   )
  )
- (func $z (; 49 ;) (param $x f32)
+ (func $z (param $x f32)
   (nop)
  )
- (func $w (; 50 ;) (result f64)
+ (func $w (result f64)
   (return
    (f64.const 0)
   )
  )
- (func $globalOpts (; 51 ;)
+ (func $globalOpts
   (local $x i32)
   (local $y f64)
   (local.set $x
@@ -1265,7 +1265,7 @@
    (local.get $x)
   )
  )
- (func $dropCallImport (; 52 ;)
+ (func $dropCallImport
   (if
    (call $return_int)
    (drop
@@ -1273,7 +1273,7 @@
    )
   )
  )
- (func $loophi (; 53 ;) (param $x i32) (param $y i32)
+ (func $loophi (param $x i32) (param $y i32)
   (local $temp i32)
   (local $inc i32)
   (local $loopvar i32)
@@ -1316,7 +1316,7 @@
    )
   )
  )
- (func $loophi2 (; 54 ;) (result i32)
+ (func $loophi2 (result i32)
   (local $jnc i32)
   (local $i i32)
   (local $i$lcssa i32)
@@ -1370,7 +1370,7 @@
    (local.get $i$lcssa)
   )
  )
- (func $loophi2b (; 55 ;) (result i32)
+ (func $loophi2b (result i32)
   (local $jnc i32)
   (local $i i32)
   (local $i$lcssa i32)
@@ -1424,7 +1424,7 @@
    (local.get $i$lcssa)
   )
  )
- (func $relooperJumpThreading (; 56 ;) (param $x i32) (result i32)
+ (func $relooperJumpThreading (param $x i32) (result i32)
   (local $label i32)
   (if
    (local.get $x)
@@ -1663,7 +1663,7 @@
    (local.get $x)
   )
  )
- (func $relooperJumpThreading__ZN4game14preloadweaponsEv (; 57 ;) (param $$12 i32) (param $$14 i32) (param $$or$cond8 i32) (param $$or$cond6 i32) (param $$vararg_ptr5 i32) (param $$11 i32) (param $$exitcond i32)
+ (func $relooperJumpThreading__ZN4game14preloadweaponsEv (param $$12 i32) (param $$14 i32) (param $$or$cond8 i32) (param $$or$cond6 i32) (param $$vararg_ptr5 i32) (param $$11 i32) (param $$exitcond i32)
   (local $label i32)
   (loop $while-in
    (block $while-out
@@ -1716,7 +1716,7 @@
    )
   )
  )
- (func $relooperJumpThreading_irreducible (; 58 ;) (param $x i32)
+ (func $relooperJumpThreading_irreducible (param $x i32)
   (local $label i32)
   (if
    (i32.eq
@@ -1787,7 +1787,7 @@
    )
   )
  )
- (func $__Z12multi_varargiz (; 59 ;) (param $$0 i32) (param $$$06$i4 i32) (param $$exitcond$i6 i32) (param $$2 i32)
+ (func $__Z12multi_varargiz (param $$0 i32) (param $$$06$i4 i32) (param $$exitcond$i6 i32) (param $$2 i32)
   (local $$12 i32)
   (local $$20 i32)
   (if
@@ -1814,7 +1814,7 @@
    )
   )
  )
- (func $jumpThreadDrop (; 60 ;) (result i32)
+ (func $jumpThreadDrop (result i32)
   (local $label i32)
   (local $temp i32)
   (local.set $temp
@@ -1856,7 +1856,7 @@
    (local.get $temp)
   )
  )
- (func $dropIgnoredImportInIf (; 61 ;) (param $$0 i32) (param $$1 i32) (param $$2 i32)
+ (func $dropIgnoredImportInIf (param $$0 i32) (param $$1 i32) (param $$2 i32)
   (block $do-once
    (if
     (local.get $$0)
@@ -1876,12 +1876,12 @@
   )
   (return)
  )
- (func $big_fround (; 62 ;) (result f32)
+ (func $big_fround (result f32)
   (return
    (f32.const 4294967296)
   )
  )
- (func $dropIgnoredImportsInIf (; 63 ;) (param $$0 i32) (param $$1 i32) (param $$2 i32)
+ (func $dropIgnoredImportsInIf (param $$0 i32) (param $$1 i32) (param $$2 i32)
   (block $do-once
    (if
     (local.get $$0)
@@ -1900,21 +1900,21 @@
   )
   (return)
  )
- (func $f32_ucast (; 64 ;) (param $x i32) (result f32)
+ (func $f32_ucast (param $x i32) (result f32)
   (return
    (f32.convert_i32_u
     (local.get $x)
    )
   )
  )
- (func $f32_scast (; 65 ;) (param $x i32) (result f32)
+ (func $f32_scast (param $x i32) (result f32)
   (return
    (f32.convert_i32_s
     (local.get $x)
    )
   )
  )
- (func $store_fround (; 66 ;) (param $x i32)
+ (func $store_fround (param $x i32)
   (f64.store
    (i32.const 80)
    (f64.promote_f32
@@ -1924,7 +1924,7 @@
    )
   )
  )
- (func $relocatableAndModules (; 67 ;) (result i32)
+ (func $relocatableAndModules (result i32)
   (call_indirect (type $none_=>_none)
    (i32.const 10)
   )
@@ -1939,12 +1939,12 @@
    )
   )
  )
- (func $exported_f32_user (; 68 ;) (param $x i32) (param $y f32) (param $z f64) (result f32)
+ (func $exported_f32_user (param $x i32) (param $y f32) (param $z f64) (result f32)
   (return
    (local.get $y)
   )
  )
- (func $sqrts (; 69 ;) (param $x f64) (result f64)
+ (func $sqrts (param $x f64) (result f64)
   (return
    (f64.add
     (f64.sqrt
@@ -1960,21 +1960,21 @@
    )
   )
  )
- (func $f2u (; 70 ;) (param $x f64) (result i32)
+ (func $f2u (param $x f64) (result i32)
   (return
    (i32.trunc_f64_u
     (local.get $x)
    )
   )
  )
- (func $f2s (; 71 ;) (param $x f64) (result i32)
+ (func $f2s (param $x f64) (result i32)
   (return
    (i32.trunc_f64_s
     (local.get $x)
    )
   )
  )
- (func $autoDrop (; 72 ;) (param $x i32) (result i32)
+ (func $autoDrop (param $x i32) (result i32)
   (loop $while-in
    (block $while-out
     (if
@@ -2008,7 +2008,7 @@
    (local.get $x)
   )
  )
- (func $indirectInSequence (; 73 ;)
+ (func $indirectInSequence
   (local $i1 i32)
   (local.set $i1
    (block (result i32)
@@ -2026,7 +2026,7 @@
    )
   )
  )
- (func $emterpretify_assertions_safeHeap (; 74 ;)
+ (func $emterpretify_assertions_safeHeap
   (local $i1 i32)
   (call_indirect (type $i32_=>_none)
    (local.get $i1)
@@ -2044,7 +2044,7 @@
    )
   )
  )
- (func $call_emscripten_log (; 75 ;)
+ (func $call_emscripten_log
   (call $emscripten_log)
   (if
    (i32.const 2)
@@ -2060,7 +2060,7 @@
    )
   )
  )
- (func $mod_detectSign (; 76 ;) (param $d1 f64) (param $d2 f64) (param $d8 f64) (result i32)
+ (func $mod_detectSign (param $d1 f64) (param $d2 f64) (param $d8 f64) (result i32)
   (return
    (i32.trunc_f64_s
     (f64.sub
@@ -2079,7 +2079,7 @@
    )
   )
  )
- (func $keepAlive (; 77 ;)
+ (func $keepAlive
   (drop
    (call $sqrts
     (f64.const 3.14159)
@@ -2122,13 +2122,13 @@
    )
   )
  )
- (func $v (; 78 ;)
+ (func $v
   (nop)
  )
- (func $vi (; 79 ;) (param $x i32)
+ (func $vi (param $x i32)
   (nop)
  )
- (func $ii (; 80 ;) (param $x i32) (result i32)
+ (func $ii (param $x i32) (result i32)
   (return
    (local.get $x)
   )