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

diff --git a/test/dynamicLibrary.fromasm.no-opts b/test/dynamicLibrary.fromasm.no-opts
index a1fcd0b3b..c854926e9 100644
--- a/test/dynamicLibrary.fromasm.no-opts
+++ b/test/dynamicLibrary.fromasm.no-opts
@@ -47,7 +47,7 @@
  (export "__post_instantiate" (func $__post_instantiate))
  (export "runPostSets" (func $runPostSets))
  (export "_global" (global $_global))
- (func $stackAlloc (; 2 ;) (param $size i32) (result i32)
+ (func $stackAlloc (param $size i32) (result i32)
   (local $ret i32)
   (local.set $ret
    (global.get $STACKTOP)
@@ -80,17 +80,17 @@
    (local.get $ret)
   )
  )
- (func $stackSave (; 3 ;) (result i32)
+ (func $stackSave (result i32)
   (return
    (global.get $STACKTOP)
   )
  )
- (func $stackRestore (; 4 ;) (param $top i32)
+ (func $stackRestore (param $top i32)
   (global.set $STACKTOP
    (local.get $top)
   )
  )
- (func $establishStackSpace (; 5 ;) (param $stackBase i32) (param $stackMax i32)
+ (func $establishStackSpace (param $stackBase i32) (param $stackMax i32)
   (global.set $STACKTOP
    (local.get $stackBase)
   )
@@ -98,7 +98,7 @@
    (local.get $stackMax)
   )
  )
- (func $setThrew (; 6 ;) (param $threw i32) (param $value i32)
+ (func $setThrew (param $threw i32) (param $value i32)
   (if
    (i32.eq
     (global.get $__THREW__)
@@ -114,7 +114,7 @@
    )
   )
  )
- (func $___cxx_global_var_init (; 7 ;)
+ (func $___cxx_global_var_init
   (local $label i32)
   (local $sp i32)
   (local.set $sp
@@ -128,7 +128,7 @@
   )
   (return)
  )
- (func $__ZN3FooC2Ev (; 8 ;) (param $$0 i32)
+ (func $__ZN3FooC2Ev (param $$0 i32)
   (local $$1 i32)
   (local $label i32)
   (local $sp i32)
@@ -166,7 +166,7 @@
   )
   (return)
  )
- (func $__GLOBAL__sub_I_liblib_cpp (; 9 ;)
+ (func $__GLOBAL__sub_I_liblib_cpp
   (local $label i32)
   (local $sp i32)
   (local.set $sp
@@ -175,11 +175,11 @@
   (call $___cxx_global_var_init)
   (return)
  )
- (func $runPostSets (; 10 ;)
+ (func $runPostSets
   (local $temp i32)
   (nop)
  )
- (func $__post_instantiate (; 11 ;)
+ (func $__post_instantiate
   (global.set $STACKTOP
    (i32.add
     (global.get $memoryBase)