17 files changed, 33 insertions, 33 deletions
diff --git a/test/passes/converge_O3_metrics.bin.txt b/test/passes/converge_O3_metrics.bin.txt
index 23b53d99b..b445b6464 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 $1 256 256))
+ (import "env" "memory" (memory $mimport$1 256 256))
  (data (i32.const 2948) "\03")
  (data (i32.const 6828) "\04")
  (data (i32.const 7028) "\0d\00\00\00\06")
@@ -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 $1 256 256))
+ (import "env" "memory" (memory $mimport$1 256 256))
  (data (i32.const 2948) "\03")
  (data (i32.const 6828) "\04")
  (data (i32.const 7028) "\0d\00\00\00\06")
diff --git a/test/passes/fannkuch0_dwarf.bin.txt b/test/passes/fannkuch0_dwarf.bin.txt
index 2873bf2cd..c2e5369af 100644
--- a/test/passes/fannkuch0_dwarf.bin.txt
+++ b/test/passes/fannkuch0_dwarf.bin.txt
@@ -5195,9 +5195,9 @@ file_names[  3]:
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (type $none_=>_none (func))
  (type $i32_=>_none (func (param i32)))
- (import "env" "memory" (memory $4 256 256))
+ (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$5 1 funcref))
+ (import "env" "__indirect_function_table" (table $timport$1 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 4ff3cff6c..e9b07a971 100644
--- a/test/passes/fannkuch3_dwarf.bin.txt
+++ b/test/passes/fannkuch3_dwarf.bin.txt
@@ -4795,9 +4795,9 @@ file_names[  4]:
  (type $none_=>_none (func))
  (type $i32_=>_none (func (param i32)))
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
- (import "env" "memory" (memory $7 256 256))
+ (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$8 1 funcref))
+ (import "env" "__indirect_function_table" (table $timport$1 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/fannkuch3_manyopts_dwarf.bin.txt b/test/passes/fannkuch3_manyopts_dwarf.bin.txt
index 4e72e0826..36c9db37b 100644
--- a/test/passes/fannkuch3_manyopts_dwarf.bin.txt
+++ b/test/passes/fannkuch3_manyopts_dwarf.bin.txt
@@ -4715,7 +4715,7 @@ file_names[  4]:
  (type $none_=>_none (func))
  (type $i32_=>_none (func (param i32)))
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
- (import "env" "memory" (memory $7 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (data (i32.const 1024) "Pfannkuchen(%d) = %d.\n\00%d\00Wrong argument.")
  (import "env" "malloc" (func $malloc (param i32) (result i32)))
  (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32)))
diff --git a/test/passes/fib2_dwarf.bin.txt b/test/passes/fib2_dwarf.bin.txt
index ac0c26cf5..15e57c8aa 100644
--- a/test/passes/fib2_dwarf.bin.txt
+++ b/test/passes/fib2_dwarf.bin.txt
@@ -617,7 +617,7 @@ file_names[  1]:
  (type $none_=>_i32 (func (result i32)))
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (import "env" "__indirect_function_table" (table $timport$1 1 funcref))
  (global $global$0 (mut i32) (i32.const 5243904))
  (global $global$1 i32 (i32.const 1024))
diff --git a/test/passes/fib2_emptylocspan_dwarf.bin.txt b/test/passes/fib2_emptylocspan_dwarf.bin.txt
index 21f2fb878..1b7686887 100644
--- a/test/passes/fib2_emptylocspan_dwarf.bin.txt
+++ b/test/passes/fib2_emptylocspan_dwarf.bin.txt
@@ -617,7 +617,7 @@ file_names[  1]:
  (type $none_=>_i32 (func (result i32)))
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (import "env" "__indirect_function_table" (table $timport$1 1 funcref))
  (global $global$0 (mut i32) (i32.const 5243904))
  (global $global$1 i32 (i32.const 1024))
diff --git a/test/passes/fib_nonzero-low-pc_dwarf.bin.txt b/test/passes/fib_nonzero-low-pc_dwarf.bin.txt
index ac28b21a4..4e7156e9f 100644
--- a/test/passes/fib_nonzero-low-pc_dwarf.bin.txt
+++ b/test/passes/fib_nonzero-low-pc_dwarf.bin.txt
@@ -511,11 +511,11 @@ file_names[  1]:
 (module
  (type $none_=>_none (func))
  (type $i32_=>_i32 (func (param i32) (result i32)))
- (import "env" "memory" (memory $3 0))
- (import "env" "__indirect_function_table" (table $timport$4 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))
+ (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))
  (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/func-metrics.txt b/test/passes/func-metrics.txt
index 9eb7fd131..731dd933d 100644
--- a/test/passes/func-metrics.txt
+++ b/test/passes/func-metrics.txt
@@ -219,7 +219,7 @@ func: func_a
  block          : 1       
  call           : 5       
 start: func_a
- [removable-bytes-without-it]: 67      
+ [removable-bytes-without-it]: 57      
  [total]        : 0       
 (module
  (type $none_=>_none (func))
@@ -247,7 +247,7 @@ func: 0
  [vars]         : 0       
  global.get     : 1       
 export: stackSave (0)
- [removable-bytes-without-it]: 66      
+ [removable-bytes-without-it]: 70      
  [total]        : 0       
 (module
  (type $none_=>_i32 (func (result i32)))
diff --git a/test/passes/ignore_missing_func_dwarf.bin.txt b/test/passes/ignore_missing_func_dwarf.bin.txt
index c5f45cfdc..337f81f14 100644
--- a/test/passes/ignore_missing_func_dwarf.bin.txt
+++ b/test/passes/ignore_missing_func_dwarf.bin.txt
@@ -3,7 +3,7 @@
  (type $none_=>_i32 (func (result i32)))
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (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))
@@ -826,7 +826,7 @@ file_names[  1]:
  (type $none_=>_i32 (func (result i32)))
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (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))
diff --git a/test/passes/inlined_to_start_dwarf.bin.txt b/test/passes/inlined_to_start_dwarf.bin.txt
index 7b8694021..7205cf070 100644
--- a/test/passes/inlined_to_start_dwarf.bin.txt
+++ b/test/passes/inlined_to_start_dwarf.bin.txt
@@ -414,7 +414,7 @@ file_names[  1]:
  (type $none_=>_none (func))
  (type $i32_=>_none (func (param i32)))
  (type $i32_=>_i32 (func (param i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (data (i32.const 1024) "\00\00\00\00")
  (table $0 1 1 funcref)
  (global $global$0 (mut i32) (i32.const 5243920))
diff --git a/test/passes/multi_line_table_dwarf.bin.txt b/test/passes/multi_line_table_dwarf.bin.txt
index 84305a175..f3f65ff8e 100644
--- a/test/passes/multi_line_table_dwarf.bin.txt
+++ b/test/passes/multi_line_table_dwarf.bin.txt
@@ -423,11 +423,11 @@ file_names[  1]:
 (module
  (type $none_=>_none (func))
  (type $none_=>_i32 (func (result i32)))
- (import "env" "memory" (memory $3 0))
- (import "env" "__indirect_function_table" (table $timport$4 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))
+ (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))
  (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/print.bin.txt b/test/passes/print.bin.txt
index 02fc5a36e..4ea2361ec 100644
--- a/test/passes/print.bin.txt
+++ b/test/passes/print.bin.txt
@@ -4,7 +4,7 @@
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (global $global$0 (mut i32) (i32.const 5243904))
  (global $global$1 i32 (i32.const 1024))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
@@ -95,7 +95,7 @@
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (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/print_g.bin.txt b/test/passes/print_g.bin.txt
index 9afde51e1..0980d4c7f 100644
--- a/test/passes/print_g.bin.txt
+++ b/test/passes/print_g.bin.txt
@@ -4,7 +4,7 @@
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (global $global$0 (mut i32) (i32.const 5243904))
  (global $global$1 i32 (i32.const 1024))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
@@ -134,7 +134,7 @@
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (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/print_g_strip-dwarf.bin.txt b/test/passes/print_g_strip-dwarf.bin.txt
index 9d0331fca..15df9c09f 100644
--- a/test/passes/print_g_strip-dwarf.bin.txt
+++ b/test/passes/print_g_strip-dwarf.bin.txt
@@ -4,7 +4,7 @@
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (global $global$0 (mut i32) (i32.const 5243904))
  (global $global$1 i32 (i32.const 1024))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
@@ -95,7 +95,7 @@
  (type $i32_=>_none (func (param i32)))
  (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "memory" (memory $0 256 256))
+ (import "env" "memory" (memory $mimport$0 256 256))
  (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/reverse_dwarf_abbrevs.bin.txt b/test/passes/reverse_dwarf_abbrevs.bin.txt
index 0b021420d..99da237b6 100644
--- a/test/passes/reverse_dwarf_abbrevs.bin.txt
+++ b/test/passes/reverse_dwarf_abbrevs.bin.txt
@@ -120,7 +120,7 @@ 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 $3 256 256))
+ (import "env" "memory" (memory $mimport$3 256 256))
  (data (i32.const 1024) "hello, world!\00\00\00\18\04")
  (data (i32.const 1048) "\05")
  (data (i32.const 1060) "\01")
diff --git a/test/passes/strip-debug.bin.txt b/test/passes/strip-debug.bin.txt
index 5b5720991..90627c525 100644
--- a/test/passes/strip-debug.bin.txt
+++ b/test/passes/strip-debug.bin.txt
@@ -1,6 +1,6 @@
 (module
  (type $none_=>_i32 (func (result i32)))
- (import "env" "__linear_memory" (memory $0 0))
+ (import "env" "__linear_memory" (memory $mimport$0 0))
  (import "env" "__indirect_function_table" (table $timport$1 0 funcref))
  (func $0 (result i32)
   (local $0 i32)
diff --git a/test/passes/strip-producers.bin.txt b/test/passes/strip-producers.bin.txt
index 2c1070ae5..3f7b535b4 100644
--- a/test/passes/strip-producers.bin.txt
+++ b/test/passes/strip-producers.bin.txt
@@ -1,6 +1,6 @@
 (module
  (type $none_=>_i32 (func (result i32)))
- (import "env" "__linear_memory" (memory $0 0))
+ (import "env" "__linear_memory" (memory $mimport$0 0))
  (import "env" "__indirect_function_table" (table $timport$1 0 funcref))
  (func $0 (result i32)
   (local $0 i32)