Fix applying default / unify SExpr and Wasm builder names (#3179)

SExpressionWasmBuilder was not applying default memory and table import names on the memory and table, unlike on functions, globals and events, where it applies them. Also aligns default import names to use the same shorter forms as in binary parsing.

11 files changed, 25 insertions, 25 deletions

diff --git a/test/passes/O3_low-memory-unused_metrics.txt b/test/passes/O3_low-memory-unused_metrics.txt
index 22d72d241..4989dec5f 100644
--- a/test/passes/O3_low-memory-unused_metrics.txt
+++ b/test/passes/O3_low-memory-unused_metrics.txt
@@ -29,8 +29,8 @@ total
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (type $i32_=>_none (func (param i32)))
  (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
- (import "env" "memory" (memory $0 4096 4096))
- (import "env" "table" (table $0 10 funcref))
+ (import "env" "memory" (memory $108 4096 4096))
+ (import "env" "table" (table $timport$109 10 funcref))
  (import "env" "crc32" (func $fimport$14 (param i32 i32 i32) (result i32)))
  (import "env" "adler32" (func $fimport$15 (param i32 i32 i32) (result i32)))
  (import "env" "deflate_huff" (func $fimport$20 (param i32 i32) (result i32)))
diff --git a/test/passes/O4_disable-bulk-memory.txt b/test/passes/O4_disable-bulk-memory.txt
index 454b23abb..730c2ac0f 100644
--- a/test/passes/O4_disable-bulk-memory.txt
+++ b/test/passes/O4_disable-bulk-memory.txt
@@ -13,7 +13,7 @@
  (type $f64_f64_f64_f64_f64_f64_f64_=>_i32 (func (param f64 f64 f64 f64 f64 f64 f64) (result i32)))
  (type $none_=>_f64 (func (result f64)))
  (type $i32_=>_f64 (func (param i32) (result f64)))
- (import "env" "memory" (memory $0 1))
+ (import "env" "memory" (memory $1 1))
  (data (i32.const 8) "\0d\00\00\00~\00l\00i\00b\00/\00a\00r\00r\00a\00y\00.\00t\00s")
  (data (i32.const 40) "\1c\00\00\00~\00l\00i\00b\00/\00i\00n\00t\00e\00r\00n\00a\00l\00/\00a\00r\00r\00a\00y\00b\00u\00f\00f\00e\00r\00.\00t\00s")
  (table $0 1 funcref)
diff --git a/test/passes/directize_enable-tail-call.txt b/test/passes/directize_enable-tail-call.txt
index af172e825..97956bee5 100644
--- a/test/passes/directize_enable-tail-call.txt
+++ b/test/passes/directize_enable-tail-call.txt
@@ -56,7 +56,7 @@
 )
 (module
  (type $i32_i32_=>_none (func (param i32 i32)))
- (import "env" "table" (table $0 5 5 funcref))
+ (import "env" "table" (table $table 5 5 funcref))
  (elem (i32.const 1) $foo)
  (func $foo (param $0 i32) (param $1 i32)
   (unreachable)
diff --git a/test/passes/inlining-optimizing_optimize-level=3.txt b/test/passes/inlining-optimizing_optimize-level=3.txt
index bcb7db0bd..1b8a1b9f5 100644
--- a/test/passes/inlining-optimizing_optimize-level=3.txt
+++ b/test/passes/inlining-optimizing_optimize-level=3.txt
@@ -13,7 +13,7 @@
  (type $f64_i32_=>_f64 (func (param f64 i32) (result f64)))
  (import "env" "memory" (memory $0 256 256))
  (data (i32.const 1024) "emcc_hello_world.asm.js")
- (import "env" "table" (table $0 18 18 funcref))
+ (import "env" "table" (table $timport$0 18 18 funcref))
  (elem (global.get $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
  (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32))
diff --git a/test/passes/minify-imports-and-exports_all-features.txt b/test/passes/minify-imports-and-exports_all-features.txt
index 355e15b94..e5b99a84a 100644
--- a/test/passes/minify-imports-and-exports_all-features.txt
+++ b/test/passes/minify-imports-and-exports_all-features.txt
@@ -5009,9 +5009,9 @@ longname4880 => zza
  (type $none_=>_none (func))
  (type $i32_=>_none (func (param i32)))
  (type $i32_i32_=>_none (func (param i32 i32)))
- (import "env" "a" (global $import$global0 i32))
- (import "env" "b" (global $import$global1 i32))
- (import "env" "c" (global $import$global2 i32))
+ (import "env" "a" (global $gimport$0 i32))
+ (import "env" "b" (global $gimport$1 i32))
+ (import "env" "c" (global $gimport$2 i32))
  (import "env" "d" (func $internal1))
  (import "env" "e" (func $internal2))
  (import "env" "f" (func $internal3))
diff --git a/test/passes/minify-imports_all-features.txt b/test/passes/minify-imports_all-features.txt
index 019cd7ee5..1be765254 100644
--- a/test/passes/minify-imports_all-features.txt
+++ b/test/passes/minify-imports_all-features.txt
@@ -5005,9 +5005,9 @@ longname4880 => zza
  (type $none_=>_none (func))
  (type $i32_=>_none (func (param i32)))
  (type $i32_i32_=>_none (func (param i32 i32)))
- (import "env" "a" (global $import$global0 i32))
- (import "env" "b" (global $import$global1 i32))
- (import "env" "c" (global $import$global2 i32))
+ (import "env" "a" (global $gimport$0 i32))
+ (import "env" "b" (global $gimport$1 i32))
+ (import "env" "c" (global $gimport$2 i32))
  (import "env" "d" (func $internal1))
  (import "env" "e" (func $internal2))
  (import "env" "f" (func $internal3))
diff --git a/test/passes/print-call-graph.txt b/test/passes/print-call-graph.txt
index 9d1143610..7c8398405 100644
--- a/test/passes/print-call-graph.txt
+++ b/test/passes/print-call-graph.txt
@@ -122,7 +122,7 @@ digraph call {
  (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "memory" (memory $0 256 256))
  (data (global.get $memoryBase) "\05\00\00\00\00\00\00\00\00\00\00\00\01\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\01\00\00\00\02\00\00\00\b0\04\00\00\00\04\00\00\00\00\00\00\00\00\00\00\01\00\00\00\00\00\00\00\00\00\00\00\00\00\00\n\ff\ff\ff\ff\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\04")
- (import "env" "table" (table $0 9 9 funcref))
+ (import "env" "table" (table $timport$0 9 9 funcref))
  (elem (i32.const 0) $b0 $___stdio_close $b1 $___stdout_write $___stdio_seek $___stdio_write $b2 $_cleanup_387 $b3)
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
  (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32))
diff --git a/test/passes/remove-imports.txt b/test/passes/remove-imports.txt
index e76949425..40758ca27 100644
--- a/test/passes/remove-imports.txt
+++ b/test/passes/remove-imports.txt
@@ -1,8 +1,8 @@
 (module
  (type $none_=>_none (func))
- (import "env" "table" (table $0 1 1 funcref))
+ (import "env" "table" (table $table 1 1 funcref))
  (elem (i32.const 0) $waka-sneaky)
- (import "env" "memBase" (global $import$global0 i32))
+ (import "env" "memBase" (global $gimport$0 i32))
  (import "somewhere" "waka-sneaky" (func $waka-sneaky))
  (memory $0 1024 1024)
  (func $nada
diff --git a/test/passes/remove-unused-module-elements_all-features.txt b/test/passes/remove-unused-module-elements_all-features.txt
index 47f02aeb5..e79257211 100644
--- a/test/passes/remove-unused-module-elements_all-features.txt
+++ b/test/passes/remove-unused-module-elements_all-features.txt
@@ -85,7 +85,7 @@
 )
 (module
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table $0 1 funcref))
+ (import "env" "table" (table $timport$0 1 funcref))
  (export "mem" (memory $0))
  (export "tab" (table $0))
 )
@@ -93,7 +93,7 @@
  (type $none_=>_none (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1) "hello, world!")
- (import "env" "table" (table $0 1 funcref))
+ (import "env" "table" (table $timport$0 1 funcref))
  (elem (i32.const 0) $waka)
  (func $waka
   (nop)
@@ -102,7 +102,7 @@
 (module
  (type $none_=>_none (func))
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table $0 0 funcref))
+ (import "env" "table" (table $timport$0 0 funcref))
  (export "user" (func $user))
  (func $user
   (drop
@@ -208,7 +208,7 @@
  (type $none_=>_none (func))
  (import "env" "memory" (memory $0 256))
  (data (global.get $memoryBase) "hello, world!")
- (import "env" "table" (table $0 0 funcref))
+ (import "env" "table" (table $timport$0 0 funcref))
  (elem (global.get $tableBase) $waka)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
@@ -265,7 +265,7 @@
 )
 (module
  (type $f64_=>_f64 (func (param f64) (result f64)))
- (import "env" "table" (table $0 6 6 funcref))
+ (import "env" "table" (table $timport$0 6 6 funcref))
  (elem (i32.const 0) $0)
  (func $0 (param $var$0 f64) (result f64)
   (if (result f64)
diff --git a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt
index 49636f323..e82601a79 100644
--- a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt
+++ b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt
@@ -9,7 +9,7 @@
  (type $f64_=>_i32 (func (param f64) (result i32)))
  (type $i32_=>_i64 (func (param i32) (result i64)))
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table $0 18 18 funcref))
+ (import "env" "table" (table $timport$0 18 18 funcref))
  (import "env" "DYNAMICTOP_PTR" (global $import$0 i32))
  (import "env" "tempDoublePtr" (global $import$1 i32))
  (import "env" "ABORT" (global $import$2 i32))
diff --git a/test/passes/remove-unused-nonfunction-module-elements_all-features.txt b/test/passes/remove-unused-nonfunction-module-elements_all-features.txt
index 22ad3d015..2091e9560 100644
--- a/test/passes/remove-unused-nonfunction-module-elements_all-features.txt
+++ b/test/passes/remove-unused-nonfunction-module-elements_all-features.txt
@@ -100,7 +100,7 @@
 )
 (module
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table $0 1 funcref))
+ (import "env" "table" (table $timport$0 1 funcref))
  (export "mem" (memory $0))
  (export "tab" (table $0))
 )
@@ -108,7 +108,7 @@
  (type $none_=>_none (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1) "hello, world!")
- (import "env" "table" (table $0 1 funcref))
+ (import "env" "table" (table $timport$0 1 funcref))
  (elem (i32.const 0) $waka)
  (func $waka
   (nop)
@@ -117,7 +117,7 @@
 (module
  (type $none_=>_none (func))
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table $0 0 funcref))
+ (import "env" "table" (table $timport$0 0 funcref))
  (export "user" (func $user))
  (func $user
   (drop
@@ -223,7 +223,7 @@
  (type $none_=>_none (func))
  (import "env" "memory" (memory $0 256))
  (data (global.get $memoryBase) "hello, world!")
- (import "env" "table" (table $0 0 funcref))
+ (import "env" "table" (table $timport$0 0 funcref))
  (elem (global.get $tableBase) $waka)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
@@ -316,7 +316,7 @@
 )
 (module
  (type $f64_=>_f64 (func (param f64) (result f64)))
- (import "env" "table" (table $0 6 6 funcref))
+ (import "env" "table" (table $timport$0 6 6 funcref))
  (elem (i32.const 0) $0)
  (func $0 (param $var$0 f64) (result f64)
   (if (result f64)