diff options
Diffstat (limited to 'test/merge')
30 files changed, 188 insertions, 139 deletions
diff --git a/test/merge/basics.wast.combined b/test/merge/basics.wast.combined index 96ea89cfd..66e9221a0 100644 --- a/test/merge/basics.wast.combined +++ b/test/merge/basics.wast.combined @@ -9,8 +9,12 @@ (elem (get_global $tableBase) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) (import "env" "some-func-b" (func $some-func-b)) @@ -87,44 +91,32 @@ (get_global $global-b-mut) ) (drop - (i32.add - (get_global $memoryBase$0) - (i32.const 16) - ) + (get_global $memoryBase$0) ) (drop - (i32.add - (get_global $tableBase$0) - (i32.const 6) - ) + (get_global $tableBase$0) ) (drop (i32.add (get_global $memoryBase$0) - (i32.const 1016) + (i32.const 1000) ) ) (drop (i32.add (get_global $tableBase$0) - (i32.const 1006) + (i32.const 1000) ) ) (drop (i32.add - (i32.add - (get_global $tableBase$0) - (i32.const 6) - ) + (get_global $tableBase$0) (unreachable) ) ) (drop (i32.sub - (i32.add - (get_global $tableBase$0) - (i32.const 6) - ) + (get_global $tableBase$0) (i32.const 1000) ) ) diff --git a/test/merge/basics.wast.combined.finalized b/test/merge/basics.wast.combined.finalized index d3530fe58..cf4386847 100644 --- a/test/merge/basics.wast.combined.finalized +++ b/test/merge/basics.wast.combined.finalized @@ -4,13 +4,17 @@ (type $ii$0 (func (param i32 i32))) (type $FUNCSIG$v$0 (func)) (import "env" "memory" (memory $0 256)) - (data (i32.const 1024) "hello, A!\n\00\00\00\00\00\00hello, B!\n\00\00\00\00\00\00") + (data (get_global $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n\00\00\00\00\00\00") (import "env" "table" (table $0 18 anyfunc)) - (elem (i32.const 8) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0) + (elem (get_global $tableBase) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) (import "env" "some-func-b" (func $some-func-b)) @@ -50,10 +54,10 @@ (get_global $global-a-mut) ) (drop - (i32.const 1024) + (get_global $memoryBase) ) (drop - (i32.const 8) + (get_global $tableBase) ) (set_global $global-collide-mut (i32.const 1234) @@ -87,44 +91,32 @@ (get_global $global-b-mut) ) (drop - (i32.add - (i32.const 1024) - (i32.const 16) - ) + (get_global $memoryBase$0) ) (drop - (i32.add - (i32.const 8) - (i32.const 6) - ) + (get_global $tableBase$0) ) (drop (i32.add - (i32.const 1024) - (i32.const 1016) + (get_global $memoryBase$0) + (i32.const 1000) ) ) (drop (i32.add - (i32.const 8) - (i32.const 1006) + (get_global $tableBase$0) + (i32.const 1000) ) ) (drop (i32.add - (i32.add - (i32.const 8) - (i32.const 6) - ) + (get_global $tableBase$0) (unreachable) ) ) (drop (i32.sub - (i32.add - (i32.const 8) - (i32.const 6) - ) + (get_global $tableBase$0) (i32.const 1000) ) ) diff --git a/test/merge/basics.wast.combined.finalized.opt b/test/merge/basics.wast.combined.finalized.opt index bb7475c45..0b9c21b3b 100644 --- a/test/merge/basics.wast.combined.finalized.opt +++ b/test/merge/basics.wast.combined.finalized.opt @@ -2,9 +2,13 @@ (type $ii (func (param i32 i32))) (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) - (data (i32.const 1024) "hello, A!\n\00\00\00\00\00\00hello, B!\n") + (data (get_global $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n") (import "env" "table" (table $0 18 anyfunc)) - (elem (i32.const 8) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0) + (elem (get_global $tableBase) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0) + (import "env" "memoryBase" (global $memoryBase i32)) + (import "env" "tableBase" (global $tableBase i32)) + (import "env" "memoryBase" (global $memoryBase$0 i32)) + (import "env" "tableBase" (global $tableBase$0 i32)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) (import "env" "some-func-b" (func $some-func-b)) @@ -33,8 +37,12 @@ (drop (get_global $global-a-mut) ) - (nop) - (nop) + (drop + (get_global $memoryBase) + ) + (drop + (get_global $tableBase) + ) (set_global $global-collide-mut (i32.const 1234) ) @@ -58,17 +66,36 @@ (drop (get_global $global-b-mut) ) - (nop) - (nop) - (nop) - (nop) + (drop + (get_global $memoryBase$0) + ) + (drop + (get_global $tableBase$0) + ) (drop (i32.add - (i32.const 14) + (get_global $memoryBase$0) + (i32.const 1000) + ) + ) + (drop + (i32.add + (get_global $tableBase$0) + (i32.const 1000) + ) + ) + (drop + (i32.add + (get_global $tableBase$0) (unreachable) ) ) - (nop) + (drop + (i32.sub + (get_global $tableBase$0) + (i32.const 1000) + ) + ) (set_global $global-collide-mut$0 (i32.const 5678) ) diff --git a/test/merge/basics.wast.combined.opt b/test/merge/basics.wast.combined.opt index 2a83b355e..f210529fc 100644 --- a/test/merge/basics.wast.combined.opt +++ b/test/merge/basics.wast.combined.opt @@ -67,42 +67,33 @@ (get_global $global-b-mut) ) (drop - (i32.add - (get_global $memoryBase$0) - (i32.const 16) - ) + (get_global $memoryBase$0) ) (drop - (i32.add - (get_global $tableBase$0) - (i32.const 6) - ) + (get_global $tableBase$0) ) (drop (i32.add (get_global $memoryBase$0) - (i32.const 1016) + (i32.const 1000) ) ) (drop (i32.add (get_global $tableBase$0) - (i32.const 1006) + (i32.const 1000) ) ) (drop (i32.add - (i32.add - (get_global $tableBase$0) - (i32.const 6) - ) + (get_global $tableBase$0) (unreachable) ) ) (drop - (i32.add + (i32.sub (get_global $tableBase$0) - (i32.const -994) + (i32.const 1000) ) ) (set_global $global-collide-mut$0 diff --git a/test/merge/dylib.wasm.combined b/test/merge/dylib.wasm.combined index 0b97f4af4..de84f63cb 100644 --- a/test/merge/dylib.wasm.combined +++ b/test/merge/dylib.wasm.combined @@ -11,8 +11,12 @@ (import "env" "table" (table $timport$3 0 anyfunc)) (import "env" "memoryBase" (global $gimport$0 i32)) (import "env" "tableBase" (global $gimport$4 i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $gimport$0$0 i32)) (import "env" "tableBase" (global $gimport$4$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) (global $global$0 (mut i32) (i32.const 0)) (global $global$1 (mut i32) (i32.const 0)) @@ -81,10 +85,7 @@ (block $label$1 (block $label$2 (set_global $global$0$0 - (i32.add - (get_global $gimport$0$0) - (i32.const 48) - ) + (get_global $gimport$0$0) ) (set_global $global$1$0 (i32.add diff --git a/test/merge/dylib.wasm.combined.finalized b/test/merge/dylib.wasm.combined.finalized index 4e82b433b..66a947fc7 100644 --- a/test/merge/dylib.wasm.combined.finalized +++ b/test/merge/dylib.wasm.combined.finalized @@ -7,12 +7,16 @@ (type $1$0 (func (result i32))) (type $2$0 (func)) (import "env" "memory" (memory $2 256)) - (data (i32.const 1024) "hello, world!\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\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00") + (data (get_global $gimport$0) "hello, world!\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\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00") (import "env" "table" (table $timport$3 8 anyfunc)) (import "env" "memoryBase" (global $gimport$0 i32)) (import "env" "tableBase" (global $gimport$4 i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $gimport$0$0 i32)) (import "env" "tableBase" (global $gimport$4$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) (global $global$0 (mut i32) (i32.const 0)) (global $global$1 (mut i32) (i32.const 0)) @@ -29,7 +33,7 @@ (block $label$2 (result i32) (drop (call $import$1 - (i32.const 1024) + (get_global $gimport$0) ) ) (i32.const 0) @@ -47,7 +51,7 @@ (block $label$2 (set_global $global$0 (i32.add - (i32.const 1024) + (get_global $gimport$0) (i32.const 16) ) ) @@ -81,10 +85,7 @@ (block $label$1 (block $label$2 (set_global $global$0$0 - (i32.add - (i32.const 1024) - (i32.const 48) - ) + (get_global $gimport$0$0) ) (set_global $global$1$0 (i32.add diff --git a/test/merge/dylib.wasm.combined.finalized.opt b/test/merge/dylib.wasm.combined.finalized.opt index 4598e194a..ae855f2fa 100644 --- a/test/merge/dylib.wasm.combined.finalized.opt +++ b/test/merge/dylib.wasm.combined.finalized.opt @@ -3,8 +3,10 @@ (type $2 (func (result i32))) (type $3 (func)) (import "env" "memory" (memory $2 256)) - (data (i32.const 1024) "hello, world!") + (data (get_global $gimport$0) "hello, world!") (import "env" "table" (table $timport$3 8 anyfunc)) + (import "env" "memoryBase" (global $gimport$0 i32)) + (import "env" "memoryBase" (global $gimport$0$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) (global $global$0 (mut i32) (i32.const 0)) (global $global$1 (mut i32) (i32.const 0)) @@ -21,7 +23,7 @@ (block $label$2 (result i32) (drop (call $import$1 - (i32.const 1024) + (get_global $gimport$0) ) ) (i32.const 0) @@ -36,7 +38,10 @@ (block $label$1 (block $label$2 (set_global $global$0 - (i32.const 1040) + (i32.add + (get_global $gimport$0) + (i32.const 16) + ) ) (set_global $global$1 (i32.add @@ -66,7 +71,7 @@ (block $label$1 (block $label$2 (set_global $global$0$0 - (i32.const 1072) + (get_global $gimport$0$0) ) (set_global $global$1$0 (i32.add diff --git a/test/merge/dylib.wasm.combined.opt b/test/merge/dylib.wasm.combined.opt index 7545510a3..215baca4e 100644 --- a/test/merge/dylib.wasm.combined.opt +++ b/test/merge/dylib.wasm.combined.opt @@ -6,7 +6,7 @@ (data (get_global $gimport$0) "hello, world!") (import "env" "table" (table $timport$3 0 anyfunc)) (import "env" "memoryBase" (global $gimport$0 i32)) - (import "env" "tableBase" (global $gimport$4 i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $gimport$0$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) (global $global$0 (mut i32) (i32.const 0)) @@ -72,10 +72,7 @@ (block $label$1 (block $label$2 (set_global $global$0$0 - (i32.add - (get_global $gimport$0$0) - (i32.const 48) - ) + (get_global $gimport$0$0) ) (set_global $global$1$0 (i32.add diff --git a/test/merge/fusing.wast.combined b/test/merge/fusing.wast.combined index e664a39ed..f6ab235c5 100644 --- a/test/merge/fusing.wast.combined +++ b/test/merge/fusing.wast.combined @@ -2,12 +2,16 @@ (type $FUNCSIG$v (func)) (type $FUNCSIG$v$0 (func)) (import "env" "memory" (memory $0 256)) - (data (get_global $memoryBase) "") + (data (get_global $__memory_base) "") (import "env" "table" (table $0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (global $a-global i32 (i32.const 0)) (global $b-global$0 f64 (f64.const 2.14281428)) (export "foo" (func $foo-func)) diff --git a/test/merge/fusing.wast.combined.finalized b/test/merge/fusing.wast.combined.finalized index edb5c4309..b7b85db92 100644 --- a/test/merge/fusing.wast.combined.finalized +++ b/test/merge/fusing.wast.combined.finalized @@ -6,8 +6,12 @@ (import "env" "table" (table $0 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (global $a-global i32 (i32.const 0)) (global $b-global$0 f64 (f64.const 2.14281428)) (export "foo" (func $foo-func)) diff --git a/test/merge/fusing.wast.combined.opt b/test/merge/fusing.wast.combined.opt index e8bac5d8c..15c6ab4a0 100644 --- a/test/merge/fusing.wast.combined.opt +++ b/test/merge/fusing.wast.combined.opt @@ -1,10 +1,10 @@ (module (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) - (data (get_global $memoryBase) "") + (data (get_global $__memory_base) "") (import "env" "table" (table $0 0 anyfunc)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (global $a-global i32 (i32.const 0)) (global $b-global$0 f64 (f64.const 2.14281428)) (export "foo" (func $foo-func)) diff --git a/test/merge/global-init.wast.combined b/test/merge/global-init.wast.combined index 453de1079..3fb947e84 100644 --- a/test/merge/global-init.wast.combined +++ b/test/merge/global-init.wast.combined @@ -1,13 +1,17 @@ (module (import "env" "memory" (memory $0 256)) - (data (get_global $memoryBase) "") + (data (get_global $__memory_base) "") (import "env" "table" (table $0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) (import "env" "globally" (global $i-collide$0 f64)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (global $a i32 (get_global $i-collide)) (global $a-mut (mut i32) (get_global $i-collide)) (global $g-collide i32 (get_global $i-collide)) diff --git a/test/merge/global-init.wast.combined.finalized b/test/merge/global-init.wast.combined.finalized index 89c969ea4..316e28620 100644 --- a/test/merge/global-init.wast.combined.finalized +++ b/test/merge/global-init.wast.combined.finalized @@ -5,9 +5,13 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) (import "env" "globally" (global $i-collide$0 f64)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (global $a i32 (get_global $i-collide)) (global $a-mut (mut i32) (get_global $i-collide)) (global $g-collide i32 (get_global $i-collide)) diff --git a/test/merge/global-init.wast.combined.opt b/test/merge/global-init.wast.combined.opt index 725827c88..16a998b41 100644 --- a/test/merge/global-init.wast.combined.opt +++ b/test/merge/global-init.wast.combined.opt @@ -1,7 +1,7 @@ (module (import "env" "memory" (memory $0 256)) - (data (get_global $memoryBase) "") + (data (get_global $__memory_base) "") (import "env" "table" (table $0 0 anyfunc)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) ) diff --git a/test/merge/main-lacks-segments.wast.combined b/test/merge/main-lacks-segments.wast.combined index f07f75177..648b2797b 100644 --- a/test/merge/main-lacks-segments.wast.combined +++ b/test/merge/main-lacks-segments.wast.combined @@ -1,25 +1,23 @@ (module (type $0 (func)) (import "env" "memory" (memory $0 256)) - (data (get_global $memoryBase) "hello, this is some data!\00\00\00\00\00\00\00") + (data (get_global $__memory_base) "hello, this is some data!\00\00\00\00\00\00\00") (import "env" "table" (table $0 2 anyfunc)) - (elem (get_global $tableBase) $foo $foo) + (elem (get_global $__table_base) $foo $foo) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (func $foo (; 0 ;) (type $0) (drop - (i32.add - (get_global $tableBase$0) - (i32.const 0) - ) + (get_global $tableBase$0) ) (drop - (i32.add - (get_global $memoryBase$0) - (i32.const 0) - ) + (get_global $memoryBase$0) ) ) ) diff --git a/test/merge/main-lacks-segments.wast.combined.finalized b/test/merge/main-lacks-segments.wast.combined.finalized index f37f9efe1..dd36cd0d6 100644 --- a/test/merge/main-lacks-segments.wast.combined.finalized +++ b/test/merge/main-lacks-segments.wast.combined.finalized @@ -6,20 +6,18 @@ (elem (i32.const 8) $foo $foo) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (func $foo (; 0 ;) (type $0) (drop - (i32.add - (i32.const 8) - (i32.const 0) - ) + (get_global $tableBase$0) ) (drop - (i32.add - (i32.const 1024) - (i32.const 0) - ) + (get_global $memoryBase$0) ) ) ) diff --git a/test/merge/main-lacks-segments.wast.combined.finalized.opt b/test/merge/main-lacks-segments.wast.combined.finalized.opt index c98706332..41136cf95 100644 --- a/test/merge/main-lacks-segments.wast.combined.finalized.opt +++ b/test/merge/main-lacks-segments.wast.combined.finalized.opt @@ -4,7 +4,14 @@ (data (i32.const 1024) "hello, this is some data!") (import "env" "table" (table $0 10 anyfunc)) (elem (i32.const 8) $foo $foo) + (import "env" "memoryBase" (global $memoryBase$0 i32)) + (import "env" "tableBase" (global $tableBase$0 i32)) (func $foo (; 0 ;) (type $0) - (nop) + (drop + (get_global $tableBase$0) + ) + (drop + (get_global $memoryBase$0) + ) ) ) diff --git a/test/merge/main-lacks-segments.wast.combined.opt b/test/merge/main-lacks-segments.wast.combined.opt index c121593c7..d70d24209 100644 --- a/test/merge/main-lacks-segments.wast.combined.opt +++ b/test/merge/main-lacks-segments.wast.combined.opt @@ -1,11 +1,11 @@ (module (type $0 (func)) (import "env" "memory" (memory $0 256)) - (data (get_global $memoryBase) "hello, this is some data!") + (data (get_global $__memory_base) "hello, this is some data!") (import "env" "table" (table $0 2 anyfunc)) - (elem (get_global $tableBase) $foo $foo) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) + (elem (get_global $__table_base) $foo $foo) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) (func $foo (; 0 ;) (type $0) diff --git a/test/merge/noBases.wast.combined b/test/merge/noBases.wast.combined index 18c63fffc..3fb42a68b 100644 --- a/test/merge/noBases.wast.combined +++ b/test/merge/noBases.wast.combined @@ -5,15 +5,15 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memory" (memory $0 256)) (data (i32.const 100) "hello, A!\n") - (data (get_global $memoryBase) "") + (data (get_global $__memory_base) "") (data (i32.const 200) "hello, B!\n") (import "env" "table" (table $0 1000 anyfunc)) (elem (i32.const 10) $only-a $willCollide $some-func $some-collide $only-a) (elem (i32.const 20) $only-b $willCollide $some-func-b $some-collide) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memoryBase" (global $memoryBase$0 i32)) - (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) (import "env" "some-func-b" (func $some-func-b)) diff --git a/test/merge/noBases.wast.combined.finalized b/test/merge/noBases.wast.combined.finalized index 72f221017..aa456c16a 100644 --- a/test/merge/noBases.wast.combined.finalized +++ b/test/merge/noBases.wast.combined.finalized @@ -10,10 +10,10 @@ (import "env" "table" (table $0 1000 anyfunc)) (elem (i32.const 10) $only-a $willCollide $some-func $some-collide $only-a) (elem (i32.const 20) $only-b $willCollide $some-func-b $some-collide) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memoryBase" (global $memoryBase$0 i32)) - (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) (import "env" "some-func-b" (func $some-func-b)) diff --git a/test/merge/noBases.wast.combined.opt b/test/merge/noBases.wast.combined.opt index 08becc2cf..f36c64cd2 100644 --- a/test/merge/noBases.wast.combined.opt +++ b/test/merge/noBases.wast.combined.opt @@ -3,13 +3,13 @@ (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) (data (i32.const 100) "hello, A!\n") - (data (get_global $memoryBase) "") + (data (get_global $__memory_base) "") (data (i32.const 200) "hello, B!\n") (import "env" "table" (table $0 1000 anyfunc)) (elem (i32.const 10) $only-a $willCollide $some-func $some-collide $only-a) (elem (i32.const 20) $only-b $willCollide $some-func-b $some-collide) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) (import "env" "some-func-b" (func $some-func-b)) diff --git a/test/merge/post-instantiate-a.wast.combined b/test/merge/post-instantiate-a.wast.combined index ae25b3e75..90a8a5d36 100644 --- a/test/merge/post-instantiate-a.wast.combined +++ b/test/merge/post-instantiate-a.wast.combined @@ -3,8 +3,12 @@ (type $0$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (export "__post_instantiate" (func $0)) (func $0 (; 0 ;) (type $0) (drop diff --git a/test/merge/post-instantiate-a.wast.combined.finalized b/test/merge/post-instantiate-a.wast.combined.finalized index ae25b3e75..90a8a5d36 100644 --- a/test/merge/post-instantiate-a.wast.combined.finalized +++ b/test/merge/post-instantiate-a.wast.combined.finalized @@ -3,8 +3,12 @@ (type $0$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (export "__post_instantiate" (func $0)) (func $0 (; 0 ;) (type $0) (drop diff --git a/test/merge/post-instantiate-a.wast.combined.opt b/test/merge/post-instantiate-a.wast.combined.opt index 933ee2c2c..8685b4066 100644 --- a/test/merge/post-instantiate-a.wast.combined.opt +++ b/test/merge/post-instantiate-a.wast.combined.opt @@ -1,7 +1,7 @@ (module (type $0 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (export "__post_instantiate" (func $0)) (func $0 (; 0 ;) (type $0) (nop) diff --git a/test/merge/post-instantiate-b.wast.combined b/test/merge/post-instantiate-b.wast.combined index f832716a9..551f2da2b 100644 --- a/test/merge/post-instantiate-b.wast.combined +++ b/test/merge/post-instantiate-b.wast.combined @@ -3,8 +3,12 @@ (type $0$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (export "__post_instantiate" (func $0$0)) (func $0 (; 0 ;) (type $0) (nop) diff --git a/test/merge/post-instantiate-b.wast.combined.finalized b/test/merge/post-instantiate-b.wast.combined.finalized index f832716a9..551f2da2b 100644 --- a/test/merge/post-instantiate-b.wast.combined.finalized +++ b/test/merge/post-instantiate-b.wast.combined.finalized @@ -3,8 +3,12 @@ (type $0$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (export "__post_instantiate" (func $0$0)) (func $0 (; 0 ;) (type $0) (nop) diff --git a/test/merge/post-instantiate-b.wast.combined.opt b/test/merge/post-instantiate-b.wast.combined.opt index 8ec2a5ca8..2fa79a98b 100644 --- a/test/merge/post-instantiate-b.wast.combined.opt +++ b/test/merge/post-instantiate-b.wast.combined.opt @@ -1,7 +1,7 @@ (module (type $0$0 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (export "__post_instantiate" (func $0$0)) (func $0$0 (; 0 ;) (type $0$0) (nop) diff --git a/test/merge/printf.wast.combined b/test/merge/printf.wast.combined index a33e63fba..e7e8dff94 100644 --- a/test/merge/printf.wast.combined +++ b/test/merge/printf.wast.combined @@ -3,14 +3,18 @@ (type $FUNCSIG$iii$0 (func (param i32 i32) (result i32))) (type $1 (func)) (import "env" "memory" (memory $0 256)) - (data (get_global $memoryBase) "") + (data (get_global $__memory_base) "") (import "env" "table" (table $0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) (import "env" "globally" (global $i-collide$0 f64)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (import "env" "foobar" (func $import$8 (param i32 i32) (result i32))) (export "_printf" (func $625)) (func $625 (; 1 ;) (type $FUNCSIG$iii) (param $var$0 i32) (param $var$1 i32) (result i32) diff --git a/test/merge/printf.wast.combined.finalized b/test/merge/printf.wast.combined.finalized index a66825dbf..b4c329749 100644 --- a/test/merge/printf.wast.combined.finalized +++ b/test/merge/printf.wast.combined.finalized @@ -8,9 +8,13 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) (import "env" "globally" (global $i-collide$0 f64)) + (import "env" "__memory_base" (global $__memory_base$0 i32)) + (import "env" "__table_base" (global $__table_base$0 i32)) (import "env" "foobar" (func $import$8 (param i32 i32) (result i32))) (export "_printf" (func $625)) (func $625 (; 1 ;) (type $FUNCSIG$iii) (param $var$0 i32) (param $var$1 i32) (result i32) diff --git a/test/merge/printf.wast.combined.opt b/test/merge/printf.wast.combined.opt index 7cb267ec2..a5c6458ef 100644 --- a/test/merge/printf.wast.combined.opt +++ b/test/merge/printf.wast.combined.opt @@ -1,10 +1,10 @@ (module (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (import "env" "memory" (memory $0 256)) - (data (get_global $memoryBase) "") + (data (get_global $__memory_base) "") (import "env" "table" (table $0 0 anyfunc)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) + (import "env" "__memory_base" (global $__memory_base i32)) + (import "env" "__table_base" (global $__table_base i32)) (export "_printf" (func $625)) (func $625 (; 0 ;) (type $FUNCSIG$iii) (param $var$0 i32) (param $var$1 i32) (result i32) (i32.const 102030) |