diff options
Diffstat (limited to 'test/merge')
47 files changed, 152 insertions, 152 deletions
diff --git a/test/merge/basics.wast b/test/merge/basics.wast index 920c1e977..06063e64c 100644 --- a/test/merge/basics.wast +++ b/test/merge/basics.wast @@ -18,8 +18,8 @@ (func $only-a (drop (i32.const 100)) (call $only-a) - (call_import $some-func) - (call_import $some-collide) + (call $some-func) + (call $some-collide) (call_indirect (type $ii) (i32.const 123) (i32.const 456) diff --git a/test/merge/basics.wast.combined b/test/merge/basics.wast.combined index a0d1ea7db..11ba04715 100644 --- a/test/merge/basics.wast.combined +++ b/test/merge/basics.wast.combined @@ -3,14 +3,16 @@ (type $FUNCSIG$v (func)) (type $ii$0 (func (param i32 i32))) (type $FUNCSIG$v$0 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (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 10 anyfunc)) - (import "env" "some-func" (func $some-func)) - (import "env" "some-collide" (func $some-collide)) + (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)) (import "env" "some-collide" (func $some-collide$0)) (global $global-collide i32 (i32.const 0)) @@ -21,8 +23,6 @@ (global $global-collide-mut$0 (mut i32) (i32.const 0)) (global $global-b i32 (i32.const 1)) (global $global-b-mut (mut i32) (i32.const 1)) - (elem (get_global $tableBase) $only-a $willCollide $some-func $some-collide $only-a $only-a $only-b $willCollide$0 $some-func-b $some-collide$0) - (data (get_global $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n\00\00\00\00\00\00") (export "exp-a" (func $only-a)) (export "exp-collide" (func $only-a)) (export "exp-collide2" (func $willCollide)) diff --git a/test/merge/basics.wast.combined.finalized b/test/merge/basics.wast.combined.finalized index f68e8c808..899df6d61 100644 --- a/test/merge/basics.wast.combined.finalized +++ b/test/merge/basics.wast.combined.finalized @@ -3,14 +3,16 @@ (type $FUNCSIG$v (func)) (type $ii$0 (func (param i32 i32))) (type $FUNCSIG$v$0 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (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") (import "env" "table" (table 18 anyfunc)) - (import "env" "some-func" (func $some-func)) - (import "env" "some-collide" (func $some-collide)) + (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) + (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)) (import "env" "some-collide" (func $some-collide$0)) (global $global-collide i32 (i32.const 0)) @@ -21,8 +23,6 @@ (global $global-collide-mut$0 (mut i32) (i32.const 0)) (global $global-b i32 (i32.const 1)) (global $global-b-mut (mut i32) (i32.const 1)) - (elem (i32.const 8) $only-a $willCollide $some-func $some-collide $only-a $only-a $only-b $willCollide$0 $some-func-b $some-collide$0) - (data (i32.const 1024) "hello, A!\n\00\00\00\00\00\00hello, B!\n\00\00\00\00\00\00") (export "exp-a" (func $only-a)) (export "exp-collide" (func $only-a)) (export "exp-collide2" (func $willCollide)) diff --git a/test/merge/basics.wast.combined.finalized.opt b/test/merge/basics.wast.combined.finalized.opt index a117042bb..7f11954ae 100644 --- a/test/merge/basics.wast.combined.finalized.opt +++ b/test/merge/basics.wast.combined.finalized.opt @@ -2,7 +2,9 @@ (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") (import "env" "table" (table 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) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) (import "env" "some-func-b" (func $some-func-b)) @@ -11,8 +13,6 @@ (global $global-a-mut (mut i32) (i32.const 1)) (global $global-collide-mut$0 (mut i32) (i32.const 0)) (global $global-b-mut (mut i32) (i32.const 1)) - (elem (i32.const 8) $only-a $willCollide $some-func $some-collide $only-a $only-a $only-b $willCollide$0 $some-func-b $some-collide$0) - (data (i32.const 1024) "hello, A!\n\00\00\00\00\00\00hello, B!\n") (export "exp-a" (func $only-a)) (export "exp-collide" (func $only-a)) (export "exp-collide2" (func $willCollide)) diff --git a/test/merge/basics.wast.combined.finalized.opt.stdout b/test/merge/basics.wast.combined.finalized.opt.stdout index 18fbdb05e..9795060ae 100644 --- a/test/merge/basics.wast.combined.finalized.opt.stdout +++ b/test/merge/basics.wast.combined.finalized.opt.stdout @@ -1,3 +1,3 @@ merged total memory size: 32 merged total table size: 10 -merged functions: 4 +merged functions: 8 diff --git a/test/merge/basics.wast.combined.finalized.stdout b/test/merge/basics.wast.combined.finalized.stdout index 18fbdb05e..9795060ae 100644 --- a/test/merge/basics.wast.combined.finalized.stdout +++ b/test/merge/basics.wast.combined.finalized.stdout @@ -1,3 +1,3 @@ merged total memory size: 32 merged total table size: 10 -merged functions: 4 +merged functions: 8 diff --git a/test/merge/basics.wast.combined.opt b/test/merge/basics.wast.combined.opt index d940ad38e..b533d4d2f 100644 --- a/test/merge/basics.wast.combined.opt +++ b/test/merge/basics.wast.combined.opt @@ -1,22 +1,22 @@ (module (type $ii (func (param i32 i32))) (type $FUNCSIG$v (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (get_global $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n") (import "env" "table" (table 10 anyfunc)) - (import "env" "some-func" (func $some-func)) - (import "env" "some-collide" (func $some-collide)) + (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)) (import "env" "some-collide" (func $some-collide$0)) (global $global-collide-mut (mut i32) (i32.const 0)) (global $global-a-mut (mut i32) (i32.const 1)) (global $global-collide-mut$0 (mut i32) (i32.const 0)) (global $global-b-mut (mut i32) (i32.const 1)) - (elem (get_global $tableBase) $only-a $willCollide $some-func $some-collide $only-a $only-a $only-b $willCollide$0 $some-func-b $some-collide$0) - (data (get_global $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n") (export "exp-a" (func $only-a)) (export "exp-collide" (func $only-a)) (export "exp-collide2" (func $willCollide)) diff --git a/test/merge/basics.wast.combined.opt.stdout b/test/merge/basics.wast.combined.opt.stdout index 18fbdb05e..9795060ae 100644 --- a/test/merge/basics.wast.combined.opt.stdout +++ b/test/merge/basics.wast.combined.opt.stdout @@ -1,3 +1,3 @@ merged total memory size: 32 merged total table size: 10 -merged functions: 4 +merged functions: 8 diff --git a/test/merge/basics.wast.combined.stdout b/test/merge/basics.wast.combined.stdout index 18fbdb05e..9795060ae 100644 --- a/test/merge/basics.wast.combined.stdout +++ b/test/merge/basics.wast.combined.stdout @@ -1,3 +1,3 @@ merged total memory size: 32 merged total table size: 10 -merged functions: 4 +merged functions: 8 diff --git a/test/merge/basics.wast.toMerge b/test/merge/basics.wast.toMerge index 97d4a73a3..352aae888 100644 --- a/test/merge/basics.wast.toMerge +++ b/test/merge/basics.wast.toMerge @@ -20,7 +20,7 @@ (drop (i32.const 111)) (call $only-b) (call $some-func-b) - (call_import $some-collide) + (call $some-collide) (call_indirect (type $ii) (i32.const 12) (i32.const 34) diff --git a/test/merge/dylib.wasm.combined b/test/merge/dylib.wasm.combined index 1b2dbf7cc..32c886d34 100644 --- a/test/merge/dylib.wasm.combined +++ b/test/merge/dylib.wasm.combined @@ -6,19 +6,19 @@ (type $0$0 (func (param i32 i32))) (type $1$0 (func (result i32))) (type $2$0 (func)) - (import "env" "memoryBase" (global $gimport$0 i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $2 256)) + (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 0 anyfunc)) + (import "env" "memoryBase" (global $gimport$0 i32)) (import "env" "tableBase" (global $gimport$4 i32)) - (import "env" "_puts" (func $import$1 (param i32) (result i32))) (import "env" "memoryBase" (global $gimport$0$0 i32)) (import "env" "tableBase" (global $gimport$4$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)) (global $global$2 i32 (i32.const 0)) (global $global$0$0 (mut i32) (i32.const 0)) (global $global$1$0 (mut i32) (i32.const 0)) - (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") (export "__post_instantiate" (func $__post_instantiate)) (export "_main" (func $_main)) (export "runPostSets" (func $runPostSets)) diff --git a/test/merge/dylib.wasm.combined.finalized b/test/merge/dylib.wasm.combined.finalized index 2015bb7f0..e52c5b849 100644 --- a/test/merge/dylib.wasm.combined.finalized +++ b/test/merge/dylib.wasm.combined.finalized @@ -6,19 +6,19 @@ (type $0$0 (func (param i32 i32))) (type $1$0 (func (result i32))) (type $2$0 (func)) - (import "env" "memoryBase" (global $gimport$0 i32)) - (import "env" "memory" (memory $0 256)) + (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") (import "env" "table" (table 8 anyfunc)) + (import "env" "memoryBase" (global $gimport$0 i32)) (import "env" "tableBase" (global $gimport$4 i32)) - (import "env" "_puts" (func $import$1 (param i32) (result i32))) (import "env" "memoryBase" (global $gimport$0$0 i32)) (import "env" "tableBase" (global $gimport$4$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)) (global $global$2 i32 (i32.const 0)) (global $global$0$0 (mut i32) (i32.const 0)) (global $global$1$0 (mut i32) (i32.const 0)) - (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") (export "__post_instantiate" (func $__post_instantiate)) (export "_main" (func $_main)) (export "runPostSets" (func $runPostSets)) diff --git a/test/merge/dylib.wasm.combined.finalized.opt b/test/merge/dylib.wasm.combined.finalized.opt index 57d60021f..bac5abbc6 100644 --- a/test/merge/dylib.wasm.combined.finalized.opt +++ b/test/merge/dylib.wasm.combined.finalized.opt @@ -2,7 +2,8 @@ (type $1 (func (param i32) (result i32))) (type $2 (func (result i32))) (type $3 (func)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $2 256)) + (data (i32.const 1024) "hello, world!") (import "env" "table" (table 8 anyfunc)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) (global $global$0 (mut i32) (i32.const 0)) @@ -10,7 +11,6 @@ (global $global$2 i32 (i32.const 0)) (global $global$0$0 (mut i32) (i32.const 0)) (global $global$1$0 (mut i32) (i32.const 0)) - (data (i32.const 1024) "hello, world!") (export "__post_instantiate" (func $__post_instantiate)) (export "_main" (func $_main)) (export "runPostSets" (func $runPostSets)) diff --git a/test/merge/dylib.wasm.combined.finalized.opt.stdout b/test/merge/dylib.wasm.combined.finalized.opt.stdout index fb480861a..ce210156f 100644 --- a/test/merge/dylib.wasm.combined.finalized.opt.stdout +++ b/test/merge/dylib.wasm.combined.finalized.opt.stdout @@ -1,3 +1,3 @@ merged total memory size: 64 merged total table size: 0 -merged functions: 6 +merged functions: 7 diff --git a/test/merge/dylib.wasm.combined.finalized.stdout b/test/merge/dylib.wasm.combined.finalized.stdout index fb480861a..ce210156f 100644 --- a/test/merge/dylib.wasm.combined.finalized.stdout +++ b/test/merge/dylib.wasm.combined.finalized.stdout @@ -1,3 +1,3 @@ merged total memory size: 64 merged total table size: 0 -merged functions: 6 +merged functions: 7 diff --git a/test/merge/dylib.wasm.combined.opt b/test/merge/dylib.wasm.combined.opt index 8d1ddfbb4..2aa6075be 100644 --- a/test/merge/dylib.wasm.combined.opt +++ b/test/merge/dylib.wasm.combined.opt @@ -2,18 +2,18 @@ (type $1 (func (param i32) (result i32))) (type $2 (func (result i32))) (type $3 (func)) - (import "env" "memoryBase" (global $gimport$0 i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $2 256)) + (data (get_global $gimport$0) "hello, world!") (import "env" "table" (table 0 anyfunc)) + (import "env" "memoryBase" (global $gimport$0 i32)) (import "env" "tableBase" (global $gimport$4 i32)) - (import "env" "_puts" (func $import$1 (param i32) (result 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)) (global $global$2 i32 (i32.const 0)) (global $global$0$0 (mut i32) (i32.const 0)) (global $global$1$0 (mut i32) (i32.const 0)) - (data (get_global $gimport$0) "hello, world!") (export "__post_instantiate" (func $__post_instantiate)) (export "_main" (func $_main)) (export "runPostSets" (func $runPostSets)) diff --git a/test/merge/dylib.wasm.combined.opt.stdout b/test/merge/dylib.wasm.combined.opt.stdout index fb480861a..ce210156f 100644 --- a/test/merge/dylib.wasm.combined.opt.stdout +++ b/test/merge/dylib.wasm.combined.opt.stdout @@ -1,3 +1,3 @@ merged total memory size: 64 merged total table size: 0 -merged functions: 6 +merged functions: 7 diff --git a/test/merge/dylib.wasm.combined.stdout b/test/merge/dylib.wasm.combined.stdout index fb480861a..ce210156f 100644 --- a/test/merge/dylib.wasm.combined.stdout +++ b/test/merge/dylib.wasm.combined.stdout @@ -1,3 +1,3 @@ merged total memory size: 64 merged total table size: 0 -merged functions: 6 +merged functions: 7 diff --git a/test/merge/fusing.wast b/test/merge/fusing.wast index 588647e35..0c537936f 100644 --- a/test/merge/fusing.wast +++ b/test/merge/fusing.wast @@ -10,7 +10,7 @@ (import "env" "bglobal" (global $b-global f64)) (func $foo-func (drop (i32.const 1337)) - (call_import $bar-func) + (call $bar-func) (drop (get_global $a-global)) (drop (get_global $b-global)) ) diff --git a/test/merge/fusing.wast.combined b/test/merge/fusing.wast.combined index d3d0bbed3..9510bb02e 100644 --- a/test/merge/fusing.wast.combined +++ b/test/merge/fusing.wast.combined @@ -1,35 +1,35 @@ (module (type $FUNCSIG$v (func)) (type $FUNCSIG$v$0 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (get_global $memoryBase) "") (import "env" "table" (table 0 anyfunc)) + (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)) (global $a-global i32 (i32.const 0)) - (global $b-global f64 (f64.const 2.14281428)) - (data (get_global $memoryBase) "") + (global $b-global$0 f64 (f64.const 2.14281428)) (export "foo" (func $foo-func)) (export "aglobal" (global $a-global)) - (export "bar" (func $bar-func)) - (export "bglobal" (global $b-global)) + (export "bar" (func $bar-func$0)) + (export "bglobal" (global $b-global$0)) (func $foo-func (; 0 ;) (type $FUNCSIG$v) (drop (i32.const 1337) ) - (call $bar-func) + (call $bar-func$0) (drop (get_global $a-global) ) (drop - (get_global $b-global) + (get_global $b-global$0) ) ) (func $b (; 1 ;) (type $FUNCSIG$v$0) (call $foo-func) ) - (func $bar-func (; 2 ;) (type $FUNCSIG$v$0) + (func $bar-func$0 (; 2 ;) (type $FUNCSIG$v$0) (drop (f64.const 3.14159) ) @@ -37,7 +37,7 @@ (get_global $a-global) ) (drop - (get_global $b-global) + (get_global $b-global$0) ) ) ) diff --git a/test/merge/fusing.wast.combined.finalized b/test/merge/fusing.wast.combined.finalized index 0473302d3..658fdd716 100644 --- a/test/merge/fusing.wast.combined.finalized +++ b/test/merge/fusing.wast.combined.finalized @@ -1,35 +1,35 @@ (module (type $FUNCSIG$v (func)) (type $FUNCSIG$v$0 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (i32.const 1024) "") (import "env" "table" (table 8 anyfunc)) + (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)) (global $a-global i32 (i32.const 0)) - (global $b-global f64 (f64.const 2.14281428)) - (data (i32.const 1024) "") + (global $b-global$0 f64 (f64.const 2.14281428)) (export "foo" (func $foo-func)) (export "aglobal" (global $a-global)) - (export "bar" (func $bar-func)) - (export "bglobal" (global $b-global)) + (export "bar" (func $bar-func$0)) + (export "bglobal" (global $b-global$0)) (func $foo-func (; 0 ;) (type $FUNCSIG$v) (drop (i32.const 1337) ) - (call $bar-func) + (call $bar-func$0) (drop (get_global $a-global) ) (drop - (get_global $b-global) + (get_global $b-global$0) ) ) (func $b (; 1 ;) (type $FUNCSIG$v$0) (call $foo-func) ) - (func $bar-func (; 2 ;) (type $FUNCSIG$v$0) + (func $bar-func$0 (; 2 ;) (type $FUNCSIG$v$0) (drop (f64.const 3.14159) ) @@ -37,7 +37,7 @@ (get_global $a-global) ) (drop - (get_global $b-global) + (get_global $b-global$0) ) ) ) diff --git a/test/merge/fusing.wast.combined.finalized.opt b/test/merge/fusing.wast.combined.finalized.opt index 9a07b683c..4d96b29fe 100644 --- a/test/merge/fusing.wast.combined.finalized.opt +++ b/test/merge/fusing.wast.combined.finalized.opt @@ -3,18 +3,18 @@ (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 anyfunc)) (global $a-global i32 (i32.const 0)) - (global $b-global f64 (f64.const 2.14281428)) + (global $b-global$0 f64 (f64.const 2.14281428)) (export "foo" (func $foo-func)) (export "aglobal" (global $a-global)) - (export "bar" (func $bar-func)) - (export "bglobal" (global $b-global)) + (export "bar" (func $bar-func$0)) + (export "bglobal" (global $b-global$0)) (func $foo-func (; 0 ;) (type $FUNCSIG$v) (nop) - (call $bar-func) + (call $bar-func$0) (nop) (nop) ) - (func $bar-func (; 1 ;) (type $FUNCSIG$v) + (func $bar-func$0 (; 1 ;) (type $FUNCSIG$v) (nop) ) ) diff --git a/test/merge/fusing.wast.combined.opt b/test/merge/fusing.wast.combined.opt index c27ab0228..903fd65e0 100644 --- a/test/merge/fusing.wast.combined.opt +++ b/test/merge/fusing.wast.combined.opt @@ -1,23 +1,23 @@ (module (type $FUNCSIG$v (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (get_global $memoryBase) "") (import "env" "table" (table 0 anyfunc)) + (import "env" "memoryBase" (global $memoryBase i32)) + (import "env" "tableBase" (global $tableBase i32)) (global $a-global i32 (i32.const 0)) - (global $b-global f64 (f64.const 2.14281428)) - (data (get_global $memoryBase) "") + (global $b-global$0 f64 (f64.const 2.14281428)) (export "foo" (func $foo-func)) (export "aglobal" (global $a-global)) - (export "bar" (func $bar-func)) - (export "bglobal" (global $b-global)) + (export "bar" (func $bar-func$0)) + (export "bglobal" (global $b-global$0)) (func $foo-func (; 0 ;) (type $FUNCSIG$v) (nop) - (call $bar-func) + (call $bar-func$0) (nop) (nop) ) - (func $bar-func (; 1 ;) (type $FUNCSIG$v) + (func $bar-func$0 (; 1 ;) (type $FUNCSIG$v) (nop) ) ) diff --git a/test/merge/global-init.wast.combined b/test/merge/global-init.wast.combined index 095d6056b..b45babeef 100644 --- a/test/merge/global-init.wast.combined +++ b/test/merge/global-init.wast.combined @@ -1,8 +1,9 @@ (module - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (get_global $memoryBase) "") (import "env" "table" (table 0 anyfunc)) + (import "env" "memoryBase" (global $memoryBase i32)) + (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) @@ -15,5 +16,4 @@ (global $b-mut (mut f64) (get_global $i-collide$0)) (global $g-collide$0 f64 (get_global $i-collide$0)) (global $g-collide-mut$0 (mut f64) (get_global $i-collide$0)) - (data (get_global $memoryBase) "") ) diff --git a/test/merge/global-init.wast.combined.finalized b/test/merge/global-init.wast.combined.finalized index 832e86457..87e21a05e 100644 --- a/test/merge/global-init.wast.combined.finalized +++ b/test/merge/global-init.wast.combined.finalized @@ -1,8 +1,9 @@ (module - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (i32.const 1024) "") (import "env" "table" (table 8 anyfunc)) + (import "env" "memoryBase" (global $memoryBase i32)) + (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) @@ -15,5 +16,4 @@ (global $b-mut (mut f64) (get_global $i-collide$0)) (global $g-collide$0 f64 (get_global $i-collide$0)) (global $g-collide-mut$0 (mut f64) (get_global $i-collide$0)) - (data (i32.const 1024) "") ) diff --git a/test/merge/global-init.wast.combined.opt b/test/merge/global-init.wast.combined.opt index 604f3ede8..3f91f9bc9 100644 --- a/test/merge/global-init.wast.combined.opt +++ b/test/merge/global-init.wast.combined.opt @@ -1,7 +1,7 @@ (module - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) (data (get_global $memoryBase) "") + (import "env" "table" (table 0 anyfunc)) + (import "env" "memoryBase" (global $memoryBase i32)) + (import "env" "tableBase" (global $tableBase i32)) ) diff --git a/test/merge/main-lacks-segments.wast.combined b/test/merge/main-lacks-segments.wast.combined index 91fcde27d..0bd5d2d4f 100644 --- a/test/merge/main-lacks-segments.wast.combined +++ b/test/merge/main-lacks-segments.wast.combined @@ -1,13 +1,13 @@ (module (type $0 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (get_global $memoryBase) "hello, this is some data!\00\00\00\00\00\00\00") (import "env" "table" (table 2 anyfunc)) + (elem (get_global $tableBase) $foo $foo) + (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)) - (elem (get_global $tableBase) $foo $foo) - (data (get_global $memoryBase) "hello, this is some data!\00\00\00\00\00\00\00") (func $foo (; 0 ;) (type $0) (drop (i32.add diff --git a/test/merge/main-lacks-segments.wast.combined.finalized b/test/merge/main-lacks-segments.wast.combined.finalized index dd180662d..65bc5f1ad 100644 --- a/test/merge/main-lacks-segments.wast.combined.finalized +++ b/test/merge/main-lacks-segments.wast.combined.finalized @@ -1,13 +1,13 @@ (module (type $0 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (i32.const 1024) "hello, this is some data!\00\00\00\00\00\00\00") (import "env" "table" (table 10 anyfunc)) + (elem (i32.const 8) $foo $foo) + (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)) - (elem (i32.const 8) $foo $foo) - (data (i32.const 1024) "hello, this is some data!\00\00\00\00\00\00\00") (func $foo (; 0 ;) (type $0) (drop (i32.add diff --git a/test/merge/main-lacks-segments.wast.combined.finalized.opt b/test/merge/main-lacks-segments.wast.combined.finalized.opt index d37e26438..e3ceb0ce1 100644 --- a/test/merge/main-lacks-segments.wast.combined.finalized.opt +++ b/test/merge/main-lacks-segments.wast.combined.finalized.opt @@ -1,9 +1,9 @@ (module (type $0 (func)) (import "env" "memory" (memory $0 256)) + (data (i32.const 1024) "hello, this is some data!") (import "env" "table" (table 10 anyfunc)) (elem (i32.const 8) $foo $foo) - (data (i32.const 1024) "hello, this is some data!") (func $foo (; 0 ;) (type $0) (nop) ) diff --git a/test/merge/main-lacks-segments.wast.combined.opt b/test/merge/main-lacks-segments.wast.combined.opt index 6fb489574..fe652d9cd 100644 --- a/test/merge/main-lacks-segments.wast.combined.opt +++ b/test/merge/main-lacks-segments.wast.combined.opt @@ -1,13 +1,13 @@ (module (type $0 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (get_global $memoryBase) "hello, this is some data!") (import "env" "table" (table 2 anyfunc)) + (elem (get_global $tableBase) $foo $foo) + (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)) - (elem (get_global $tableBase) $foo $foo) - (data (get_global $memoryBase) "hello, this is some data!") (func $foo (; 0 ;) (type $0) (drop (get_global $tableBase$0) diff --git a/test/merge/noBases.wast b/test/merge/noBases.wast index 8616c64e7..e6a8d1f14 100644 --- a/test/merge/noBases.wast +++ b/test/merge/noBases.wast @@ -15,8 +15,8 @@ (func $only-a (drop (i32.const 100)) (call $only-a) - (call_import $some-func) - (call_import $some-collide) + (call $some-func) + (call $some-collide) (call_indirect (type $ii) (i32.const 123) (i32.const 456) diff --git a/test/merge/noBases.wast.combined b/test/merge/noBases.wast.combined index c25a5ca19..a7753043a 100644 --- a/test/merge/noBases.wast.combined +++ b/test/merge/noBases.wast.combined @@ -4,26 +4,26 @@ (type $ii$0 (func (param i32 i32))) (type $FUNCSIG$v$0 (func)) (import "env" "memory" (memory $0 256)) + (data (i32.const 100) "hello, A!\n") + (data (get_global $memoryBase) "") + (data (i32.const 200) "hello, B!\n") (import "env" "table" (table 1000 anyfunc)) - (import "env" "some-func" (func $some-func)) - (import "env" "some-collide" (func $some-collide)) + (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" "some-func-b" (func $some-func-b)) - (import "env" "some-collide" (func $some-collide$0)) (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)) + (import "env" "some-collide" (func $some-collide$0)) (global $global-collide i32 (i32.const 0)) (global $global-collide-mut (mut i32) (i32.const 0)) (global $global-a i32 (i32.const 1)) (global $global-collide$0 i32 (i32.const 0)) (global $global-collide-mut$0 (mut i32) (i32.const 0)) (global $global-b i32 (i32.const 1)) - (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) - (data (i32.const 100) "hello, A!\n") - (data (get_global $memoryBase) "") - (data (i32.const 200) "hello, B!\n") (export "exp-a" (func $only-a)) (export "exp-collide" (func $only-a)) (export "exp-collide2" (func $willCollide)) diff --git a/test/merge/noBases.wast.combined.finalized b/test/merge/noBases.wast.combined.finalized index b9f066f44..b31aa6909 100644 --- a/test/merge/noBases.wast.combined.finalized +++ b/test/merge/noBases.wast.combined.finalized @@ -4,26 +4,26 @@ (type $ii$0 (func (param i32 i32))) (type $FUNCSIG$v$0 (func)) (import "env" "memory" (memory $0 256)) + (data (i32.const 100) "hello, A!\n") + (data (i32.const 1024) "") + (data (i32.const 200) "hello, B!\n") (import "env" "table" (table 1000 anyfunc)) - (import "env" "some-func" (func $some-func)) - (import "env" "some-collide" (func $some-collide)) + (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" "some-func-b" (func $some-func-b)) - (import "env" "some-collide" (func $some-collide$0)) (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)) + (import "env" "some-collide" (func $some-collide$0)) (global $global-collide i32 (i32.const 0)) (global $global-collide-mut (mut i32) (i32.const 0)) (global $global-a i32 (i32.const 1)) (global $global-collide$0 i32 (i32.const 0)) (global $global-collide-mut$0 (mut i32) (i32.const 0)) (global $global-b i32 (i32.const 1)) - (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) - (data (i32.const 100) "hello, A!\n") - (data (i32.const 1024) "") - (data (i32.const 200) "hello, B!\n") (export "exp-a" (func $only-a)) (export "exp-collide" (func $only-a)) (export "exp-collide2" (func $willCollide)) diff --git a/test/merge/noBases.wast.combined.finalized.opt b/test/merge/noBases.wast.combined.finalized.opt index 8f8433211..935a8f326 100644 --- a/test/merge/noBases.wast.combined.finalized.opt +++ b/test/merge/noBases.wast.combined.finalized.opt @@ -2,17 +2,17 @@ (type $ii (func (param i32 i32))) (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) + (data (i32.const 100) "hello, A!\n") + (data (i32.const 200) "hello, B!\n") (import "env" "table" (table 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" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) (import "env" "some-func-b" (func $some-func-b)) (import "env" "some-collide" (func $some-collide$0)) (global $global-collide-mut (mut i32) (i32.const 0)) (global $global-collide-mut$0 (mut i32) (i32.const 0)) - (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) - (data (i32.const 100) "hello, A!\n") - (data (i32.const 200) "hello, B!\n") (export "exp-a" (func $only-a)) (export "exp-collide" (func $only-a)) (export "exp-collide2" (func $willCollide)) diff --git a/test/merge/noBases.wast.combined.finalized.opt.stdout b/test/merge/noBases.wast.combined.finalized.opt.stdout index 793188b23..9227c4942 100644 --- a/test/merge/noBases.wast.combined.finalized.opt.stdout +++ b/test/merge/noBases.wast.combined.finalized.opt.stdout @@ -1,3 +1,3 @@ merged total memory size: 10 merged total table size: 5 -merged functions: 4 +merged functions: 8 diff --git a/test/merge/noBases.wast.combined.finalized.stdout b/test/merge/noBases.wast.combined.finalized.stdout index 793188b23..9227c4942 100644 --- a/test/merge/noBases.wast.combined.finalized.stdout +++ b/test/merge/noBases.wast.combined.finalized.stdout @@ -1,3 +1,3 @@ merged total memory size: 10 merged total table size: 5 -merged functions: 4 +merged functions: 8 diff --git a/test/merge/noBases.wast.combined.opt b/test/merge/noBases.wast.combined.opt index 921cf5f9b..106ba475e 100644 --- a/test/merge/noBases.wast.combined.opt +++ b/test/merge/noBases.wast.combined.opt @@ -2,20 +2,20 @@ (type $ii (func (param i32 i32))) (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) + (data (i32.const 100) "hello, A!\n") + (data (get_global $memoryBase) "") + (data (i32.const 200) "hello, B!\n") (import "env" "table" (table 1000 anyfunc)) - (import "env" "some-func" (func $some-func)) - (import "env" "some-collide" (func $some-collide)) + (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" "some-func" (func $some-func)) + (import "env" "some-collide" (func $some-collide)) (import "env" "some-func-b" (func $some-func-b)) (import "env" "some-collide" (func $some-collide$0)) (global $global-collide-mut (mut i32) (i32.const 0)) (global $global-collide-mut$0 (mut i32) (i32.const 0)) - (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) - (data (i32.const 100) "hello, A!\n") - (data (get_global $memoryBase) "") - (data (i32.const 200) "hello, B!\n") (export "exp-a" (func $only-a)) (export "exp-collide" (func $only-a)) (export "exp-collide2" (func $willCollide)) diff --git a/test/merge/noBases.wast.combined.opt.stdout b/test/merge/noBases.wast.combined.opt.stdout index 793188b23..9227c4942 100644 --- a/test/merge/noBases.wast.combined.opt.stdout +++ b/test/merge/noBases.wast.combined.opt.stdout @@ -1,3 +1,3 @@ merged total memory size: 10 merged total table size: 5 -merged functions: 4 +merged functions: 8 diff --git a/test/merge/noBases.wast.combined.stdout b/test/merge/noBases.wast.combined.stdout index 793188b23..9227c4942 100644 --- a/test/merge/noBases.wast.combined.stdout +++ b/test/merge/noBases.wast.combined.stdout @@ -1,3 +1,3 @@ merged total memory size: 10 merged total table size: 5 -merged functions: 4 +merged functions: 8 diff --git a/test/merge/noBases.wast.toMerge b/test/merge/noBases.wast.toMerge index 313b5fb73..59f96c043 100644 --- a/test/merge/noBases.wast.toMerge +++ b/test/merge/noBases.wast.toMerge @@ -17,7 +17,7 @@ (drop (i32.const 111)) (call $only-b) (call $some-func-b) - (call_import $some-collide) + (call $some-collide) (call_indirect (type $ii) (i32.const 12) (i32.const 34) diff --git a/test/merge/printf.wast.combined b/test/merge/printf.wast.combined index dfaa49d8a..5183cd442 100644 --- a/test/merge/printf.wast.combined +++ b/test/merge/printf.wast.combined @@ -2,16 +2,16 @@ (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$iii$0 (func (param i32 i32) (result i32))) (type $1 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (get_global $memoryBase) "") (import "env" "table" (table 0 anyfunc)) + (import "env" "memoryBase" (global $memoryBase i32)) + (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) - (import "env" "foobar" (func $import$8 (param i32 i32) (result i32))) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) (import "env" "globally" (global $i-collide$0 f64)) - (data (get_global $memoryBase) "") + (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) (i32.const 102030) diff --git a/test/merge/printf.wast.combined.finalized b/test/merge/printf.wast.combined.finalized index 364da8b95..99751c51c 100644 --- a/test/merge/printf.wast.combined.finalized +++ b/test/merge/printf.wast.combined.finalized @@ -2,16 +2,16 @@ (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$iii$0 (func (param i32 i32) (result i32))) (type $1 (func)) - (import "env" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) + (data (i32.const 1024) "") (import "env" "table" (table 8 anyfunc)) + (import "env" "memoryBase" (global $memoryBase i32)) + (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) - (import "env" "foobar" (func $import$8 (param i32 i32) (result i32))) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) (import "env" "globally" (global $i-collide$0 f64)) - (data (i32.const 1024) "") + (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) (i32.const 102030) diff --git a/test/merge/printf.wast.combined.finalized.opt.stdout b/test/merge/printf.wast.combined.finalized.opt.stdout index 3816869a7..80b514d22 100644 --- a/test/merge/printf.wast.combined.finalized.opt.stdout +++ b/test/merge/printf.wast.combined.finalized.opt.stdout @@ -1,3 +1,3 @@ merged total memory size: 0 merged total table size: 0 -merged functions: 2 +merged functions: 3 diff --git a/test/merge/printf.wast.combined.finalized.stdout b/test/merge/printf.wast.combined.finalized.stdout index 3816869a7..80b514d22 100644 --- a/test/merge/printf.wast.combined.finalized.stdout +++ b/test/merge/printf.wast.combined.finalized.stdout @@ -1,3 +1,3 @@ merged total memory size: 0 merged total table size: 0 -merged functions: 2 +merged functions: 3 diff --git a/test/merge/printf.wast.combined.opt b/test/merge/printf.wast.combined.opt index a6ebd316e..da8b8fd29 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" "memoryBase" (global $memoryBase i32)) - (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) (data (get_global $memoryBase) "") + (import "env" "table" (table 0 anyfunc)) + (import "env" "memoryBase" (global $memoryBase i32)) + (import "env" "tableBase" (global $tableBase i32)) (export "_printf" (func $625)) (func $625 (; 0 ;) (type $FUNCSIG$iii) (param $var$0 i32) (param $var$1 i32) (result i32) (i32.const 102030) diff --git a/test/merge/printf.wast.combined.opt.stdout b/test/merge/printf.wast.combined.opt.stdout index 3816869a7..80b514d22 100644 --- a/test/merge/printf.wast.combined.opt.stdout +++ b/test/merge/printf.wast.combined.opt.stdout @@ -1,3 +1,3 @@ merged total memory size: 0 merged total table size: 0 -merged functions: 2 +merged functions: 3 diff --git a/test/merge/printf.wast.combined.stdout b/test/merge/printf.wast.combined.stdout index 3816869a7..80b514d22 100644 --- a/test/merge/printf.wast.combined.stdout +++ b/test/merge/printf.wast.combined.stdout @@ -1,3 +1,3 @@ merged total memory size: 0 merged total table size: 0 -merged functions: 2 +merged functions: 3 |