ensure unique import names for each type, by giving them a prefix, avoiding collisions between say a global import and a function with a name from the name section that happens to match it (#1424)

1 files changed, 20 insertions, 20 deletions

diff --git a/test/fib-dbg.wasm.fromBinary b/test/fib-dbg.wasm.fromBinary
index cd431a054..dec09980e 100644
--- a/test/fib-dbg.wasm.fromBinary
+++ b/test/fib-dbg.wasm.fromBinary
@@ -4,32 +4,32 @@
  (type $2 (func (result i32)))
  (type $3 (func (param i32)))
  (type $4 (func))
- (import "env" "DYNAMICTOP_PTR" (global $import$0 i32))
- (import "env" "tempDoublePtr" (global $import$1 i32))
- (import "env" "ABORT" (global $import$2 i32))
- (import "env" "STACKTOP" (global $import$3 i32))
- (import "env" "STACK_MAX" (global $import$4 i32))
- (import "env" "gb" (global $import$5 i32))
- (import "env" "fb" (global $import$6 i32))
- (import "global" "NaN" (global $import$7 f64))
- (import "global" "Infinity" (global $import$8 f64))
+ (import "env" "DYNAMICTOP_PTR" (global $gimport$0 i32))
+ (import "env" "tempDoublePtr" (global $gimport$1 i32))
+ (import "env" "ABORT" (global $gimport$2 i32))
+ (import "env" "STACKTOP" (global $gimport$3 i32))
+ (import "env" "STACK_MAX" (global $gimport$4 i32))
+ (import "env" "gb" (global $gimport$5 i32))
+ (import "env" "fb" (global $gimport$6 i32))
+ (import "global" "NaN" (global $gimport$7 f64))
+ (import "global" "Infinity" (global $gimport$8 f64))
  (import "env" "memory" (memory $0 256 256))
  (import "env" "table" (table 0 0 anyfunc))
- (import "env" "memoryBase" (global $import$11 i32))
- (import "env" "tableBase" (global $import$12 i32))
- (global $global$0 (mut i32) (get_global $import$0))
- (global $global$1 (mut i32) (get_global $import$1))
- (global $global$2 (mut i32) (get_global $import$2))
- (global $global$3 (mut i32) (get_global $import$3))
- (global $global$4 (mut i32) (get_global $import$4))
- (global $global$5 (mut i32) (get_global $import$5))
- (global $global$6 (mut i32) (get_global $import$6))
+ (import "env" "memoryBase" (global $gimport$11 i32))
+ (import "env" "tableBase" (global $gimport$12 i32))
+ (global $global$0 (mut i32) (get_global $gimport$0))
+ (global $global$1 (mut i32) (get_global $gimport$1))
+ (global $global$2 (mut i32) (get_global $gimport$2))
+ (global $global$3 (mut i32) (get_global $gimport$3))
+ (global $global$4 (mut i32) (get_global $gimport$4))
+ (global $global$5 (mut i32) (get_global $gimport$5))
+ (global $global$6 (mut i32) (get_global $gimport$6))
  (global $global$7 (mut i32) (i32.const 0))
  (global $global$8 (mut i32) (i32.const 0))
  (global $global$9 (mut i32) (i32.const 0))
  (global $global$10 (mut i32) (i32.const 0))
- (global $global$11 (mut f64) (get_global $import$7))
- (global $global$12 (mut f64) (get_global $import$8))
+ (global $global$11 (mut f64) (get_global $gimport$7))
+ (global $global$12 (mut f64) (get_global $gimport$8))
  (global $global$13 (mut i32) (i32.const 0))
  (global $global$14 (mut i32) (i32.const 0))
  (global $global$15 (mut i32) (i32.const 0))