Assign import names consistently between text and binaryn reader (#3238)

The s-parser was assigning numbers names per-type where as
the binaryn reader was using the global import count as the
number to append.

This change switches to use per-element count which I think
it preferable as it increases the stability of the auto-generated
names.  e.g. memory is now always named `$mimport0`.

18 files changed, 50 insertions, 50 deletions

diff --git a/test/dylib.wasm.fromBinary b/test/dylib.wasm.fromBinary
index dcf6f4ec4..8c8a517d9 100644
--- a/test/dylib.wasm.fromBinary
+++ b/test/dylib.wasm.fromBinary
@@ -3,9 +3,9 @@
  (type $none_=>_none (func))
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $mimport$5 0))
- (data (global.get $gimport$4) "*\00\00\00")
- (import "env" "__memory_base" (global $gimport$4 i32))
+ (import "env" "memory" (memory $mimport$0 0))
+ (data (global.get $gimport$0) "*\00\00\00")
+ (import "env" "__memory_base" (global $gimport$0 i32))
  (import "env" "g$waka_mine" (func $fimport$0 (result i32)))
  (import "env" "g$waka_others" (func $fimport$1 (result i32)))
  (import "env" "fp$_Z16waka_func_theirsi$ii" (func $fimport$2 (result i32)))
diff --git a/test/export-import.wast.fromBinary.noDebugInfo b/test/export-import.wast.fromBinary.noDebugInfo
index 7f973328d..a705d1612 100644
--- a/test/export-import.wast.fromBinary.noDebugInfo
+++ b/test/export-import.wast.fromBinary.noDebugInfo
@@ -1,8 +1,8 @@
 (module
  (type $none_=>_none (func))
- (import "env" "test2" (global $gimport$1 i32))
+ (import "env" "test2" (global $gimport$0 i32))
  (import "env" "test1" (func $fimport$0))
  (export "test1" (func $fimport$0))
- (export "test2" (global $gimport$1))
+ (export "test2" (global $gimport$0))
 )
 
diff --git a/test/fib-dbg.wasm.fromBinary b/test/fib-dbg.wasm.fromBinary
index 39780b6e3..fdb0f0fec 100644
--- a/test/fib-dbg.wasm.fromBinary
+++ b/test/fib-dbg.wasm.fromBinary
@@ -4,8 +4,8 @@
  (type $none_=>_none (func))
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
- (import "env" "memory" (memory $mimport$9 256 256))
- (import "env" "table" (table $timport$10 0 0 funcref))
+ (import "env" "memory" (memory $mimport$0 256 256))
+ (import "env" "table" (table $timport$0 0 0 funcref))
  (import "env" "DYNAMICTOP_PTR" (global $gimport$0 i32))
  (import "env" "tempDoublePtr" (global $gimport$1 i32))
  (import "env" "ABORT" (global $gimport$2 i32))
@@ -15,8 +15,8 @@
  (import "env" "fb" (global $gimport$6 i32))
  (import "global" "NaN" (global $gimport$7 f64))
  (import "global" "Infinity" (global $gimport$8 f64))
- (import "env" "memoryBase" (global $gimport$11 i32))
- (import "env" "tableBase" (global $gimport$12 i32))
+ (import "env" "memoryBase" (global $gimport$9 i32))
+ (import "env" "tableBase" (global $gimport$10 i32))
  (global $global$0 (mut i32) (global.get $gimport$0))
  (global $global$1 (mut i32) (global.get $gimport$1))
  (global $global$2 (mut i32) (global.get $gimport$2))
diff --git a/test/imported_memory.wast.fromBinary.noDebugInfo b/test/imported_memory.wast.fromBinary.noDebugInfo
index 5d350d6eb..46ecefe0f 100644
--- a/test/imported_memory.wast.fromBinary.noDebugInfo
+++ b/test/imported_memory.wast.fromBinary.noDebugInfo
@@ -1,5 +1,5 @@
 (module
  (import "env" "memory" (memory $mimport$0 256 256))
- (import "env" "table" (table $timport$1 256 256 funcref))
+ (import "env" "table" (table $timport$0 256 256 funcref))
 )
 
diff --git a/test/imported_memory_growth.wast.fromBinary.noDebugInfo b/test/imported_memory_growth.wast.fromBinary.noDebugInfo
index bc550e1d2..e0dc8ab7a 100644
--- a/test/imported_memory_growth.wast.fromBinary.noDebugInfo
+++ b/test/imported_memory_growth.wast.fromBinary.noDebugInfo
@@ -1,5 +1,5 @@
 (module
  (import "env" "memory" (memory $mimport$0 256))
- (import "env" "table" (table $timport$1 256 funcref))
+ (import "env" "table" (table $timport$0 256 funcref))
 )
 
diff --git a/test/lld/shared_add_to_table.wasm.out b/test/lld/shared_add_to_table.wasm.out
index 2b8ab41f2..0c5739f1b 100644
--- a/test/lld/shared_add_to_table.wasm.out
+++ b/test/lld/shared_add_to_table.wasm.out
@@ -4,19 +4,19 @@
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $mimport$0 0))
- (data (global.get $gimport$3) "*\00\00\00")
- (import "env" "table" (table $timport$1 0 funcref))
- (import "env" "__memory_base" (global $gimport$3 i32))
- (import "env" "__table_base" (global $gimport$4 i32))
+ (data (global.get $gimport$1) "*\00\00\00")
+ (import "env" "table" (table $timport$0 0 funcref))
+ (import "env" "__memory_base" (global $gimport$1 i32))
+ (import "env" "__table_base" (global $gimport$2 i32))
  (import "env" "_Z16waka_func_theirsi" (func $waka_func_theirs\28int\29 (param i32) (result i32)))
  (import "env" "g$waka_mine" (func $g$waka_mine (result i32)))
  (import "env" "g$waka_others" (func $g$waka_others (result i32)))
  (import "env" "fp$_Z16waka_func_theirsi$ii" (func $fp$_Z16waka_func_theirsi$ii (result i32)))
  (import "env" "fp$_Z14waka_func_minei$ii" (func $fp$_Z14waka_func_minei$ii (result i32)))
+ (global $gimport$3 (mut i32) (i32.const 0))
+ (global $gimport$4 (mut i32) (i32.const 0))
+ (global $gimport$5 (mut i32) (i32.const 0))
  (global $gimport$6 (mut i32) (i32.const 0))
- (global $gimport$7 (mut i32) (i32.const 0))
- (global $gimport$8 (mut i32) (i32.const 0))
- (global $gimport$9 (mut i32) (i32.const 0))
  (global $global$0 i32 (i32.const 0))
  (global $global$1 i32 (i32.const 0))
  (export "__wasm_apply_relocs" (func $__wasm_apply_relocs))
@@ -41,15 +41,15 @@
   (local $0 i32)
   (local $1 i32)
   (local.set $0
-   (global.get $gimport$6)
+   (global.get $gimport$3)
   )
   (local.set $1
-   (global.get $gimport$7)
+   (global.get $gimport$4)
   )
   (i32.add
    (i32.add
     (i32.load
-     (global.get $gimport$8)
+     (global.get $gimport$5)
     )
     (i32.add
      (local.get $1)
@@ -57,7 +57,7 @@
     )
    )
    (i32.load
-    (global.get $gimport$9)
+    (global.get $gimport$6)
    )
   )
  )
@@ -65,16 +65,16 @@
   (call $__original_main)
  )
  (func $__assign_got_enties
-  (global.set $gimport$8
+  (global.set $gimport$5
    (call $g$waka_mine)
   )
-  (global.set $gimport$9
+  (global.set $gimport$6
    (call $g$waka_others)
   )
-  (global.set $gimport$6
+  (global.set $gimport$3
    (call $fp$_Z16waka_func_theirsi$ii)
   )
-  (global.set $gimport$7
+  (global.set $gimport$4
    (call $fp$_Z14waka_func_minei$ii)
   )
  )
diff --git a/test/passes/converge_O3_metrics.bin.txt b/test/passes/converge_O3_metrics.bin.txt
index b445b6464..0341fd6a4 100644
--- a/test/passes/converge_O3_metrics.bin.txt
+++ b/test/passes/converge_O3_metrics.bin.txt
@@ -30,7 +30,7 @@ total
  (type $none_=>_i32 (func (result i32)))
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32 i32 i32) (result i32)))
- (import "env" "memory" (memory $mimport$1 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (data (i32.const 2948) "\03")
  (data (i32.const 6828) "\04")
  (data (i32.const 7028) "\0d\00\00\00\06")
@@ -39,7 +39,7 @@ total
  (data (i32.const 18128) ",I")
  (data (i32.const 18732) "D\1b")
  (data (i32.const 18764) "`\0b")
- (import "env" "table" (table $timport$2 478 478 funcref))
+ (import "env" "table" (table $timport$0 478 478 funcref))
  (elem (i32.const 0) $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $___stdout_write $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $__ZNSt3__211__stdoutbufIcE6xsputnEPKci $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $__ZNSt3__211__stdoutbufIcE8overflowEi)
  (import "env" "___syscall146" (func $import$0 (param i32 i32) (result i32)))
  (global $global$0 (mut i32) (i32.const 1))
@@ -275,7 +275,7 @@ total
  (type $none_=>_i32 (func (result i32)))
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32 i32 i32) (result i32)))
- (import "env" "memory" (memory $mimport$1 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (data (i32.const 2948) "\03")
  (data (i32.const 6828) "\04")
  (data (i32.const 7028) "\0d\00\00\00\06")
@@ -284,7 +284,7 @@ total
  (data (i32.const 18128) ",I")
  (data (i32.const 18732) "D\1b")
  (data (i32.const 18764) "`\0b")
- (import "env" "table" (table $timport$2 478 478 funcref))
+ (import "env" "table" (table $timport$0 478 478 funcref))
  (elem (i32.const 0) $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $___stdout_write $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $__ZNSt3__211__stdoutbufIcE6xsputnEPKci $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $__ZNSt3__211__stdoutbufIcE8overflowEi)
  (import "env" "___syscall146" (func $import$0 (param i32 i32) (result i32)))
  (global $global$0 (mut i32) (i32.const 1))
diff --git a/test/passes/fannkuch0_dwarf.bin.txt b/test/passes/fannkuch0_dwarf.bin.txt
index c2e5369af..9b1261dde 100644
--- a/test/passes/fannkuch0_dwarf.bin.txt
+++ b/test/passes/fannkuch0_dwarf.bin.txt
@@ -5197,7 +5197,7 @@ file_names[  3]:
  (type $i32_=>_none (func (param i32)))
  (import "env" "memory" (memory $mimport$0 256 256))
  (data (i32.const 1024) "Wrong argument.\n\00Pfannkuchen(%d) = %d.\n\00%d\00\n\00")
- (import "env" "__indirect_function_table" (table $timport$1 1 funcref))
+ (import "env" "__indirect_function_table" (table $timport$0 1 funcref))
  (import "env" "malloc" (func $malloc (param i32) (result i32)))
  (import "env" "free" (func $free (param i32)))
  (import "env" "atoi" (func $atoi (param i32) (result i32)))
diff --git a/test/passes/fannkuch3_dwarf.bin.txt b/test/passes/fannkuch3_dwarf.bin.txt
index e9b07a971..84be99be5 100644
--- a/test/passes/fannkuch3_dwarf.bin.txt
+++ b/test/passes/fannkuch3_dwarf.bin.txt
@@ -4797,7 +4797,7 @@ file_names[  4]:
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "memory" (memory $mimport$0 256 256))
  (data (i32.const 1024) "Pfannkuchen(%d) = %d.\n\00%d\00Wrong argument.\00")
- (import "env" "__indirect_function_table" (table $timport$1 1 funcref))
+ (import "env" "__indirect_function_table" (table $timport$0 1 funcref))
  (import "env" "malloc" (func $malloc (param i32) (result i32)))
  (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32)))
  (import "env" "free" (func $free (param i32)))
diff --git a/test/passes/fib2_dwarf.bin.txt b/test/passes/fib2_dwarf.bin.txt
index 15e57c8aa..d210e124e 100644
--- a/test/passes/fib2_dwarf.bin.txt
+++ b/test/passes/fib2_dwarf.bin.txt
@@ -618,7 +618,7 @@ file_names[  1]:
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $mimport$0 256 256))
- (import "env" "__indirect_function_table" (table $timport$1 1 funcref))
+ (import "env" "__indirect_function_table" (table $timport$0 1 funcref))
  (global $global$0 (mut i32) (i32.const 5243904))
  (global $global$1 i32 (i32.const 1024))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
diff --git a/test/passes/fib2_emptylocspan_dwarf.bin.txt b/test/passes/fib2_emptylocspan_dwarf.bin.txt
index 1b7686887..21892145e 100644
--- a/test/passes/fib2_emptylocspan_dwarf.bin.txt
+++ b/test/passes/fib2_emptylocspan_dwarf.bin.txt
@@ -618,7 +618,7 @@ file_names[  1]:
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $mimport$0 256 256))
- (import "env" "__indirect_function_table" (table $timport$1 1 funcref))
+ (import "env" "__indirect_function_table" (table $timport$0 1 funcref))
  (global $global$0 (mut i32) (i32.const 5243904))
  (global $global$1 i32 (i32.const 1024))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
diff --git a/test/passes/fib_nonzero-low-pc_dwarf.bin.txt b/test/passes/fib_nonzero-low-pc_dwarf.bin.txt
index 4e7156e9f..b8c4c76a7 100644
--- a/test/passes/fib_nonzero-low-pc_dwarf.bin.txt
+++ b/test/passes/fib_nonzero-low-pc_dwarf.bin.txt
@@ -512,10 +512,10 @@ file_names[  1]:
  (type $none_=>_none (func))
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "memory" (memory $mimport$0 0))
- (import "env" "__indirect_function_table" (table $timport$1 0 funcref))
- (import "env" "__stack_pointer" (global $gimport$2 (mut i32)))
- (import "env" "__memory_base" (global $gimport$3 i32))
- (import "env" "__table_base" (global $gimport$4 i32))
+ (import "env" "__indirect_function_table" (table $timport$0 0 funcref))
+ (import "env" "__stack_pointer" (global $gimport$0 (mut i32)))
+ (import "env" "__memory_base" (global $gimport$1 i32))
+ (import "env" "__table_base" (global $gimport$2 i32))
  (global $global$0 i32 (i32.const 0))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
  (export "__wasm_apply_relocs" (func $__wasm_apply_relocs))
diff --git a/test/passes/ignore_missing_func_dwarf.bin.txt b/test/passes/ignore_missing_func_dwarf.bin.txt
index 337f81f14..1c59d7099 100644
--- a/test/passes/ignore_missing_func_dwarf.bin.txt
+++ b/test/passes/ignore_missing_func_dwarf.bin.txt
@@ -6,7 +6,7 @@
  (import "env" "memory" (memory $mimport$0 256 256))
  (data (i32.const 1024) "\nvoid used(int x) {\n  x++;\n  x--;\n  return x;\n}\n\nvoid unused(int x) {\n  x >>= 1;\n  x <<= 1;\n  return x;\n}\n\nint main() {\n  return used(42);\n}\n\00")
  (data (i32.const 1168) "\00\04\00\00")
- (import "env" "__indirect_function_table" (table $timport$1 1 funcref))
+ (import "env" "__indirect_function_table" (table $timport$0 1 funcref))
  (global $global$0 (mut i32) (i32.const 5244064))
  (global $global$1 i32 (i32.const 1172))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
@@ -829,7 +829,7 @@ file_names[  1]:
  (import "env" "memory" (memory $mimport$0 256 256))
  (data (i32.const 1024) "\nvoid used(int x) {\n  x++;\n  x--;\n  return x;\n}\n\nvoid unused(int x) {\n  x >>= 1;\n  x <<= 1;\n  return x;\n}\n\nint main() {\n  return used(42);\n}\n\00")
  (data (i32.const 1168) "\00\04\00\00")
- (import "env" "__indirect_function_table" (table $timport$1 1 funcref))
+ (import "env" "__indirect_function_table" (table $timport$0 1 funcref))
  (global $global$0 (mut i32) (i32.const 5244064))
  (global $global$1 i32 (i32.const 1172))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
diff --git a/test/passes/multi_line_table_dwarf.bin.txt b/test/passes/multi_line_table_dwarf.bin.txt
index f3f65ff8e..3adc09fef 100644
--- a/test/passes/multi_line_table_dwarf.bin.txt
+++ b/test/passes/multi_line_table_dwarf.bin.txt
@@ -424,10 +424,10 @@ file_names[  1]:
  (type $none_=>_none (func))
  (type $none_=>_i32 (func (result i32)))
  (import "env" "memory" (memory $mimport$0 0))
- (import "env" "__indirect_function_table" (table $timport$1 0 funcref))
- (import "env" "__stack_pointer" (global $gimport$2 (mut i32)))
- (import "env" "__memory_base" (global $gimport$3 i32))
- (import "env" "__table_base" (global $gimport$4 i32))
+ (import "env" "__indirect_function_table" (table $timport$0 0 funcref))
+ (import "env" "__stack_pointer" (global $gimport$0 (mut i32)))
+ (import "env" "__memory_base" (global $gimport$1 i32))
+ (import "env" "__table_base" (global $gimport$2 i32))
  (global $global$0 i32 (i32.const 0))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
  (export "__wasm_apply_relocs" (func $__wasm_apply_relocs))
diff --git a/test/passes/reverse_dwarf_abbrevs.bin.txt b/test/passes/reverse_dwarf_abbrevs.bin.txt
index 99da237b6..2da36c1d4 100644
--- a/test/passes/reverse_dwarf_abbrevs.bin.txt
+++ b/test/passes/reverse_dwarf_abbrevs.bin.txt
@@ -120,14 +120,14 @@ file_names[  1]:
  (type $none_=>_none (func))
  (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
  (type $i32_i32_i64_i32_=>_i64 (func (param i32 i32 i64 i32) (result i64)))
- (import "env" "memory" (memory $mimport$3 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (data (i32.const 1024) "hello, world!\00\00\00\18\04")
  (data (i32.const 1048) "\05")
  (data (i32.const 1060) "\01")
  (data (i32.const 1084) "\02\00\00\00\03\00\00\00\c8\04\00\00\00\04")
  (data (i32.const 1108) "\01")
  (data (i32.const 1123) "\n\ff\ff\ff\ff")
- (import "env" "__indirect_function_table" (table $timport$4 4 funcref))
+ (import "env" "__indirect_function_table" (table $timport$0 4 funcref))
  (elem (i32.const 1) $6 $5 $7)
  (import "wasi_snapshot_preview1" "fd_write" (func $fimport$0 (param i32 i32 i32 i32) (result i32)))
  (import "env" "emscripten_memcpy_big" (func $fimport$1 (param i32 i32 i32) (result i32)))
diff --git a/test/passes/strip-debug.bin.txt b/test/passes/strip-debug.bin.txt
index 90627c525..9efa8d3a8 100644
--- a/test/passes/strip-debug.bin.txt
+++ b/test/passes/strip-debug.bin.txt
@@ -1,7 +1,7 @@
 (module
  (type $none_=>_i32 (func (result i32)))
  (import "env" "__linear_memory" (memory $mimport$0 0))
- (import "env" "__indirect_function_table" (table $timport$1 0 funcref))
+ (import "env" "__indirect_function_table" (table $timport$0 0 funcref))
  (func $0 (result i32)
   (local $0 i32)
   (local.set $0
diff --git a/test/passes/strip-producers.bin.txt b/test/passes/strip-producers.bin.txt
index 3f7b535b4..75e47d46e 100644
--- a/test/passes/strip-producers.bin.txt
+++ b/test/passes/strip-producers.bin.txt
@@ -1,7 +1,7 @@
 (module
  (type $none_=>_i32 (func (result i32)))
  (import "env" "__linear_memory" (memory $mimport$0 0))
- (import "env" "__indirect_function_table" (table $timport$1 0 funcref))
+ (import "env" "__indirect_function_table" (table $timport$0 0 funcref))
  (func $0 (result i32)
   (local $0 i32)
   (local.set $0
diff --git a/test/reference-types.wast.fromBinary.noDebugInfo b/test/reference-types.wast.fromBinary.noDebugInfo
index f3bddff54..9baf18af5 100644
--- a/test/reference-types.wast.fromBinary.noDebugInfo
+++ b/test/reference-types.wast.fromBinary.noDebugInfo
@@ -9,7 +9,7 @@
  (type $none_=>_exnref (func (result exnref)))
  (type $none_=>_none (func))
  (type $externref_=>_funcref (func (param externref) (result funcref)))
- (import "env" "import_global" (global $gimport$1 externref))
+ (import "env" "import_global" (global $gimport$0 externref))
  (import "env" "import_func" (func $fimport$0 (param externref) (result funcref)))
  (table $0 4 4 funcref)
  (elem (i32.const 0) $0 $1 $2 $3)
@@ -23,7 +23,7 @@
  (global $global$7 (mut anyref) (ref.func $4))
  (global $global$8 (mut anyref) (ref.null exn))
  (export "export_func" (func $fimport$0))
- (export "export_global" (global $gimport$1))
+ (export "export_global" (global $gimport$0))
  (func $0 (param $0 externref)
   (nop)
  )