diff options
Diffstat (limited to 'test/merge')
40 files changed, 254 insertions, 254 deletions
diff --git a/test/merge/basics.wast b/test/merge/basics.wast index 06063e64c..b5c40feab 100644 --- a/test/merge/basics.wast +++ b/test/merge/basics.wast @@ -3,15 +3,15 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) + (import "env" "table" (table 0 funcref)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) - (data (get_global $memoryBase) "hello, A!\n") + (data (global.get $memoryBase) "hello, A!\n") (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-a-mut (mut i32) (i32.const 1)) - (elem (get_global $tableBase) $only-a $willCollide $some-func $some-collide $only-a) + (elem (global.get $tableBase) $only-a $willCollide $some-func $some-collide $only-a) (export "exp-a" (func $only-a)) (export "exp-collide" (func $only-a)) (export "exp-collide2" (func $willCollide)) @@ -25,12 +25,12 @@ (i32.const 456) (i32.const 789) ) - (drop (get_global $global-collide)) - (drop (get_global $global-a)) - (drop (get_global $global-a-mut)) - (drop (get_global $memoryBase)) - (drop (get_global $tableBase)) - (set_global $global-collide-mut (i32.const 1234)) + (drop (global.get $global-collide)) + (drop (global.get $global-a)) + (drop (global.get $global-a-mut)) + (drop (global.get $memoryBase)) + (drop (global.get $tableBase)) + (global.set $global-collide-mut (i32.const 1234)) ) (func $willCollide (drop (i32.const 200)) diff --git a/test/merge/basics.wast.combined b/test/merge/basics.wast.combined index 66e9221a0..4d603b410 100644 --- a/test/merge/basics.wast.combined +++ b/test/merge/basics.wast.combined @@ -4,9 +4,9 @@ (type $ii$0 (func (param i32 i32))) (type $FUNCSIG$v$0 (func)) (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 $0 10 anyfunc)) - (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) + (data (global.get $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n\00\00\00\00\00\00") + (import "env" "table" (table $0 10 funcref)) + (elem (global.get $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)) @@ -45,21 +45,21 @@ (i32.const 789) ) (drop - (get_global $global-collide) + (global.get $global-collide) ) (drop - (get_global $global-a) + (global.get $global-a) ) (drop - (get_global $global-a-mut) + (global.get $global-a-mut) ) (drop - (get_global $memoryBase) + (global.get $memoryBase) ) (drop - (get_global $tableBase) + (global.get $tableBase) ) - (set_global $global-collide-mut + (global.set $global-collide-mut (i32.const 1234) ) ) @@ -82,45 +82,45 @@ (i32.const 56) ) (drop - (get_global $global-collide$0) + (global.get $global-collide$0) ) (drop - (get_global $global-b) + (global.get $global-b) ) (drop - (get_global $global-b-mut) + (global.get $global-b-mut) ) (drop - (get_global $memoryBase$0) + (global.get $memoryBase$0) ) (drop - (get_global $tableBase$0) + (global.get $tableBase$0) ) (drop (i32.add - (get_global $memoryBase$0) + (global.get $memoryBase$0) (i32.const 1000) ) ) (drop (i32.add - (get_global $tableBase$0) + (global.get $tableBase$0) (i32.const 1000) ) ) (drop (i32.add - (get_global $tableBase$0) + (global.get $tableBase$0) (unreachable) ) ) (drop (i32.sub - (get_global $tableBase$0) + (global.get $tableBase$0) (i32.const 1000) ) ) - (set_global $global-collide-mut$0 + (global.set $global-collide-mut$0 (i32.const 5678) ) ) diff --git a/test/merge/basics.wast.combined.finalized b/test/merge/basics.wast.combined.finalized index cf4386847..6dbdd2c35 100644 --- a/test/merge/basics.wast.combined.finalized +++ b/test/merge/basics.wast.combined.finalized @@ -4,9 +4,9 @@ (type $ii$0 (func (param i32 i32))) (type $FUNCSIG$v$0 (func)) (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 $0 18 anyfunc)) - (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) + (data (global.get $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n\00\00\00\00\00\00") + (import "env" "table" (table $0 18 funcref)) + (elem (global.get $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)) @@ -45,21 +45,21 @@ (i32.const 789) ) (drop - (get_global $global-collide) + (global.get $global-collide) ) (drop - (get_global $global-a) + (global.get $global-a) ) (drop - (get_global $global-a-mut) + (global.get $global-a-mut) ) (drop - (get_global $memoryBase) + (global.get $memoryBase) ) (drop - (get_global $tableBase) + (global.get $tableBase) ) - (set_global $global-collide-mut + (global.set $global-collide-mut (i32.const 1234) ) ) @@ -82,45 +82,45 @@ (i32.const 56) ) (drop - (get_global $global-collide$0) + (global.get $global-collide$0) ) (drop - (get_global $global-b) + (global.get $global-b) ) (drop - (get_global $global-b-mut) + (global.get $global-b-mut) ) (drop - (get_global $memoryBase$0) + (global.get $memoryBase$0) ) (drop - (get_global $tableBase$0) + (global.get $tableBase$0) ) (drop (i32.add - (get_global $memoryBase$0) + (global.get $memoryBase$0) (i32.const 1000) ) ) (drop (i32.add - (get_global $tableBase$0) + (global.get $tableBase$0) (i32.const 1000) ) ) (drop (i32.add - (get_global $tableBase$0) + (global.get $tableBase$0) (unreachable) ) ) (drop (i32.sub - (get_global $tableBase$0) + (global.get $tableBase$0) (i32.const 1000) ) ) - (set_global $global-collide-mut$0 + (global.set $global-collide-mut$0 (i32.const 5678) ) ) diff --git a/test/merge/basics.wast.combined.finalized.opt b/test/merge/basics.wast.combined.finalized.opt index 0b9c21b3b..057459c84 100644 --- a/test/merge/basics.wast.combined.finalized.opt +++ b/test/merge/basics.wast.combined.finalized.opt @@ -2,9 +2,9 @@ (type $ii (func (param i32 i32))) (type $FUNCSIG$v (func)) (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 $0 18 anyfunc)) - (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) + (data (global.get $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n") + (import "env" "table" (table $0 18 funcref)) + (elem (global.get $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)) @@ -35,15 +35,15 @@ (nop) (nop) (drop - (get_global $global-a-mut) + (global.get $global-a-mut) ) (drop - (get_global $memoryBase) + (global.get $memoryBase) ) (drop - (get_global $tableBase) + (global.get $tableBase) ) - (set_global $global-collide-mut + (global.set $global-collide-mut (i32.const 1234) ) ) @@ -64,39 +64,39 @@ (nop) (nop) (drop - (get_global $global-b-mut) + (global.get $global-b-mut) ) (drop - (get_global $memoryBase$0) + (global.get $memoryBase$0) ) (drop - (get_global $tableBase$0) + (global.get $tableBase$0) ) (drop (i32.add - (get_global $memoryBase$0) + (global.get $memoryBase$0) (i32.const 1000) ) ) (drop (i32.add - (get_global $tableBase$0) + (global.get $tableBase$0) (i32.const 1000) ) ) (drop (i32.add - (get_global $tableBase$0) + (global.get $tableBase$0) (unreachable) ) ) (drop (i32.sub - (get_global $tableBase$0) + (global.get $tableBase$0) (i32.const 1000) ) ) - (set_global $global-collide-mut$0 + (global.set $global-collide-mut$0 (i32.const 5678) ) ) diff --git a/test/merge/basics.wast.combined.opt b/test/merge/basics.wast.combined.opt index f210529fc..1c1b020fb 100644 --- a/test/merge/basics.wast.combined.opt +++ b/test/merge/basics.wast.combined.opt @@ -2,9 +2,9 @@ (type $ii (func (param i32 i32))) (type $FUNCSIG$v (func)) (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 $0 10 anyfunc)) - (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) + (data (global.get $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n") + (import "env" "table" (table $0 10 funcref)) + (elem (global.get $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)) @@ -35,15 +35,15 @@ (nop) (nop) (drop - (get_global $global-a-mut) + (global.get $global-a-mut) ) (drop - (get_global $memoryBase) + (global.get $memoryBase) ) (drop - (get_global $tableBase) + (global.get $tableBase) ) - (set_global $global-collide-mut + (global.set $global-collide-mut (i32.const 1234) ) ) @@ -64,39 +64,39 @@ (nop) (nop) (drop - (get_global $global-b-mut) + (global.get $global-b-mut) ) (drop - (get_global $memoryBase$0) + (global.get $memoryBase$0) ) (drop - (get_global $tableBase$0) + (global.get $tableBase$0) ) (drop (i32.add - (get_global $memoryBase$0) + (global.get $memoryBase$0) (i32.const 1000) ) ) (drop (i32.add - (get_global $tableBase$0) + (global.get $tableBase$0) (i32.const 1000) ) ) (drop (i32.add - (get_global $tableBase$0) + (global.get $tableBase$0) (unreachable) ) ) (drop (i32.sub - (get_global $tableBase$0) + (global.get $tableBase$0) (i32.const 1000) ) ) - (set_global $global-collide-mut$0 + (global.set $global-collide-mut$0 (i32.const 5678) ) ) diff --git a/test/merge/basics.wast.toMerge b/test/merge/basics.wast.toMerge index 352aae888..7230332cb 100644 --- a/test/merge/basics.wast.toMerge +++ b/test/merge/basics.wast.toMerge @@ -3,15 +3,15 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) + (import "env" "table" (table 0 funcref)) (import "env" "some-func-b" (func $some-func-b)) (import "env" "some-collide" (func $some-collide)) - (data (get_global $memoryBase) "hello, B!\n") + (data (global.get $memoryBase) "hello, B!\n") (global $global-collide i32 (i32.const 0)) (global $global-collide-mut (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-b $willCollide $some-func-b $some-collide) + (elem (global.get $tableBase) $only-b $willCollide $some-func-b $some-collide) (export "exp-b" (func $only-b)) (export "exp-collide" (func $only-b)) (export "exp-collide2" (func $willCollide)) @@ -26,36 +26,36 @@ (i32.const 34) (i32.const 56) ) - (drop (get_global $global-collide)) - (drop (get_global $global-b)) - (drop (get_global $global-b-mut)) - (drop (get_global $memoryBase)) - (drop (get_global $tableBase)) + (drop (global.get $global-collide)) + (drop (global.get $global-b)) + (drop (global.get $global-b-mut)) + (drop (global.get $memoryBase)) + (drop (global.get $tableBase)) (drop (i32.add - (get_global $memoryBase) + (global.get $memoryBase) (i32.const 1000) ) ) (drop (i32.add - (get_global $tableBase) + (global.get $tableBase) (i32.const 1000) ) ) (drop (i32.add - (get_global $tableBase) + (global.get $tableBase) (unreachable) ;; bad! ) ) (drop (i32.sub ;; bad! - (get_global $tableBase) + (global.get $tableBase) (i32.const 1000) ) ) - (set_global $global-collide-mut (i32.const 5678)) + (global.set $global-collide-mut (i32.const 5678)) ) (func $willCollide (drop (i32.const 222)) diff --git a/test/merge/dylib.wasm.combined b/test/merge/dylib.wasm.combined index de84f63cb..1e0543a5c 100644 --- a/test/merge/dylib.wasm.combined +++ b/test/merge/dylib.wasm.combined @@ -7,8 +7,8 @@ (type $1$0 (func (result i32))) (type $2$0 (func)) (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 $timport$3 0 anyfunc)) + (data (global.get $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 0 funcref)) (import "env" "memoryBase" (global $gimport$0 i32)) (import "env" "tableBase" (global $gimport$4 i32)) (import "env" "__memory_base" (global $__memory_base i32)) @@ -33,7 +33,7 @@ (block $label$2 (result i32) (drop (call $import$1 - (get_global $gimport$0) + (global.get $gimport$0) ) ) (i32.const 0) @@ -49,15 +49,15 @@ (call $__post_instantiate$0) (block $label$1 (block $label$2 - (set_global $global$0 + (global.set $global$0 (i32.add - (get_global $gimport$0) + (global.get $gimport$0) (i32.const 16) ) ) - (set_global $global$1 + (global.set $global$1 (i32.add - (get_global $global$0) + (global.get $global$0) (i32.const 32) ) ) @@ -69,10 +69,10 @@ (local $0 i32) (block $label$1 (result i32) (block $label$2 (result i32) - (set_local $0 + (local.set $0 (call $_main) ) - (get_local $0) + (local.get $0) ) ) ) @@ -84,12 +84,12 @@ (func $__post_instantiate$0 (; 6 ;) (type $2$0) (block $label$1 (block $label$2 - (set_global $global$0$0 - (get_global $gimport$0$0) + (global.set $global$0$0 + (global.get $gimport$0$0) ) - (set_global $global$1$0 + (global.set $global$1$0 (i32.add - (get_global $global$0$0) + (global.get $global$0$0) (i32.const 10) ) ) diff --git a/test/merge/dylib.wasm.combined.finalized b/test/merge/dylib.wasm.combined.finalized index 66a947fc7..f5808e177 100644 --- a/test/merge/dylib.wasm.combined.finalized +++ b/test/merge/dylib.wasm.combined.finalized @@ -7,8 +7,8 @@ (type $1$0 (func (result i32))) (type $2$0 (func)) (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 $timport$3 8 anyfunc)) + (data (global.get $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 funcref)) (import "env" "memoryBase" (global $gimport$0 i32)) (import "env" "tableBase" (global $gimport$4 i32)) (import "env" "__memory_base" (global $__memory_base i32)) @@ -33,7 +33,7 @@ (block $label$2 (result i32) (drop (call $import$1 - (get_global $gimport$0) + (global.get $gimport$0) ) ) (i32.const 0) @@ -49,15 +49,15 @@ (call $__post_instantiate$0) (block $label$1 (block $label$2 - (set_global $global$0 + (global.set $global$0 (i32.add - (get_global $gimport$0) + (global.get $gimport$0) (i32.const 16) ) ) - (set_global $global$1 + (global.set $global$1 (i32.add - (get_global $global$0) + (global.get $global$0) (i32.const 32) ) ) @@ -69,10 +69,10 @@ (local $0 i32) (block $label$1 (result i32) (block $label$2 (result i32) - (set_local $0 + (local.set $0 (call $_main) ) - (get_local $0) + (local.get $0) ) ) ) @@ -84,12 +84,12 @@ (func $__post_instantiate$0 (; 6 ;) (type $2$0) (block $label$1 (block $label$2 - (set_global $global$0$0 - (get_global $gimport$0$0) + (global.set $global$0$0 + (global.get $gimport$0$0) ) - (set_global $global$1$0 + (global.set $global$1$0 (i32.add - (get_global $global$0$0) + (global.get $global$0$0) (i32.const 10) ) ) diff --git a/test/merge/dylib.wasm.combined.finalized.opt b/test/merge/dylib.wasm.combined.finalized.opt index ae855f2fa..9f1571ef6 100644 --- a/test/merge/dylib.wasm.combined.finalized.opt +++ b/test/merge/dylib.wasm.combined.finalized.opt @@ -3,8 +3,8 @@ (type $2 (func (result i32))) (type $3 (func)) (import "env" "memory" (memory $2 256)) - (data (get_global $gimport$0) "hello, world!") - (import "env" "table" (table $timport$3 8 anyfunc)) + (data (global.get $gimport$0) "hello, world!") + (import "env" "table" (table $timport$3 8 funcref)) (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))) @@ -23,7 +23,7 @@ (block $label$2 (result i32) (drop (call $import$1 - (get_global $gimport$0) + (global.get $gimport$0) ) ) (i32.const 0) @@ -37,15 +37,15 @@ (call $__post_instantiate$0) (block $label$1 (block $label$2 - (set_global $global$0 + (global.set $global$0 (i32.add - (get_global $gimport$0) + (global.get $gimport$0) (i32.const 16) ) ) - (set_global $global$1 + (global.set $global$1 (i32.add - (get_global $global$0) + (global.get $global$0) (i32.const 32) ) ) @@ -57,10 +57,10 @@ (local $0 i32) (block $label$1 (result i32) (block $label$2 (result i32) - (set_local $0 + (local.set $0 (call $_main) ) - (get_local $0) + (local.get $0) ) ) ) @@ -70,12 +70,12 @@ (func $__post_instantiate$0 (; 6 ;) (type $3) (block $label$1 (block $label$2 - (set_global $global$0$0 - (get_global $gimport$0$0) + (global.set $global$0$0 + (global.get $gimport$0$0) ) - (set_global $global$1$0 + (global.set $global$1$0 (i32.add - (get_global $global$0$0) + (global.get $global$0$0) (i32.const 10) ) ) diff --git a/test/merge/dylib.wasm.combined.opt b/test/merge/dylib.wasm.combined.opt index 215baca4e..947257bd8 100644 --- a/test/merge/dylib.wasm.combined.opt +++ b/test/merge/dylib.wasm.combined.opt @@ -3,8 +3,8 @@ (type $2 (func (result i32))) (type $3 (func)) (import "env" "memory" (memory $2 256)) - (data (get_global $gimport$0) "hello, world!") - (import "env" "table" (table $timport$3 0 anyfunc)) + (data (global.get $gimport$0) "hello, world!") + (import "env" "table" (table $timport$3 0 funcref)) (import "env" "memoryBase" (global $gimport$0 i32)) (import "env" "__table_base" (global $__table_base i32)) (import "env" "memoryBase" (global $gimport$0$0 i32)) @@ -24,7 +24,7 @@ (block $label$2 (result i32) (drop (call $import$1 - (get_global $gimport$0) + (global.get $gimport$0) ) ) (i32.const 0) @@ -38,15 +38,15 @@ (call $__post_instantiate$0) (block $label$1 (block $label$2 - (set_global $global$0 + (global.set $global$0 (i32.add - (get_global $gimport$0) + (global.get $gimport$0) (i32.const 16) ) ) - (set_global $global$1 + (global.set $global$1 (i32.add - (get_global $global$0) + (global.get $global$0) (i32.const 32) ) ) @@ -58,10 +58,10 @@ (local $0 i32) (block $label$1 (result i32) (block $label$2 (result i32) - (set_local $0 + (local.set $0 (call $_main) ) - (get_local $0) + (local.get $0) ) ) ) @@ -71,12 +71,12 @@ (func $__post_instantiate$0 (; 6 ;) (type $3) (block $label$1 (block $label$2 - (set_global $global$0$0 - (get_global $gimport$0$0) + (global.set $global$0$0 + (global.get $gimport$0$0) ) - (set_global $global$1$0 + (global.set $global$1$0 (i32.add - (get_global $global$0$0) + (global.get $global$0$0) (i32.const 10) ) ) diff --git a/test/merge/fusing.wast b/test/merge/fusing.wast index 0c537936f..39b0167e0 100644 --- a/test/merge/fusing.wast +++ b/test/merge/fusing.wast @@ -2,7 +2,7 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) + (import "env" "table" (table 0 funcref)) (export "foo" (func $foo-func)) (import "env" "bar" (func $bar-func)) (global $a-global i32 (i32.const 0)) @@ -11,8 +11,8 @@ (func $foo-func (drop (i32.const 1337)) (call $bar-func) - (drop (get_global $a-global)) - (drop (get_global $b-global)) + (drop (global.get $a-global)) + (drop (global.get $b-global)) ) ) diff --git a/test/merge/fusing.wast.combined b/test/merge/fusing.wast.combined index f6ab235c5..57b9839d0 100644 --- a/test/merge/fusing.wast.combined +++ b/test/merge/fusing.wast.combined @@ -2,8 +2,8 @@ (type $FUNCSIG$v (func)) (type $FUNCSIG$v$0 (func)) (import "env" "memory" (memory $0 256)) - (data (get_global $__memory_base) "") - (import "env" "table" (table $0 0 anyfunc)) + (data (global.get $__memory_base) "") + (import "env" "table" (table $0 0 funcref)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "__memory_base" (global $__memory_base i32)) @@ -24,10 +24,10 @@ ) (call $bar-func$0) (drop - (get_global $a-global) + (global.get $a-global) ) (drop - (get_global $b-global$0) + (global.get $b-global$0) ) ) (func $b (; 1 ;) (type $FUNCSIG$v$0) @@ -38,10 +38,10 @@ (f64.const 3.14159) ) (drop - (get_global $a-global) + (global.get $a-global) ) (drop - (get_global $b-global$0) + (global.get $b-global$0) ) ) ) diff --git a/test/merge/fusing.wast.combined.finalized b/test/merge/fusing.wast.combined.finalized index b7b85db92..3e61b13f9 100644 --- a/test/merge/fusing.wast.combined.finalized +++ b/test/merge/fusing.wast.combined.finalized @@ -3,7 +3,7 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memory" (memory $0 256)) (data (i32.const 1024) "") - (import "env" "table" (table $0 8 anyfunc)) + (import "env" "table" (table $0 8 funcref)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "__memory_base" (global $__memory_base i32)) @@ -24,10 +24,10 @@ ) (call $bar-func$0) (drop - (get_global $a-global) + (global.get $a-global) ) (drop - (get_global $b-global$0) + (global.get $b-global$0) ) ) (func $b (; 1 ;) (type $FUNCSIG$v$0) @@ -38,10 +38,10 @@ (f64.const 3.14159) ) (drop - (get_global $a-global) + (global.get $a-global) ) (drop - (get_global $b-global$0) + (global.get $b-global$0) ) ) ) diff --git a/test/merge/fusing.wast.combined.finalized.opt b/test/merge/fusing.wast.combined.finalized.opt index 5b581aeb1..53a226ebf 100644 --- a/test/merge/fusing.wast.combined.finalized.opt +++ b/test/merge/fusing.wast.combined.finalized.opt @@ -1,7 +1,7 @@ (module (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table $0 8 anyfunc)) + (import "env" "table" (table $0 8 funcref)) (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 15c6ab4a0..a067bea4f 100644 --- a/test/merge/fusing.wast.combined.opt +++ b/test/merge/fusing.wast.combined.opt @@ -1,8 +1,8 @@ (module (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) - (data (get_global $__memory_base) "") - (import "env" "table" (table $0 0 anyfunc)) + (data (global.get $__memory_base) "") + (import "env" "table" (table $0 0 funcref)) (import "env" "__memory_base" (global $__memory_base i32)) (import "env" "__table_base" (global $__table_base i32)) (global $a-global i32 (i32.const 0)) diff --git a/test/merge/fusing.wast.toMerge b/test/merge/fusing.wast.toMerge index 4abd0a5e1..8d17795b1 100644 --- a/test/merge/fusing.wast.toMerge +++ b/test/merge/fusing.wast.toMerge @@ -2,7 +2,7 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) + (import "env" "table" (table 0 funcref)) (import "env" "foo" (func $b-foo)) (export "bar" (func $bar-func)) (global $b-global f64 (f64.const 2.14281428)) @@ -13,8 +13,8 @@ ) (func $bar-func (drop (f64.const 3.14159)) - (drop (get_global $a-global)) - (drop (get_global $b-global)) + (drop (global.get $a-global)) + (drop (global.get $b-global)) ) ) diff --git a/test/merge/global-init.wast b/test/merge/global-init.wast index 532aafd76..1f392d96c 100644 --- a/test/merge/global-init.wast +++ b/test/merge/global-init.wast @@ -2,11 +2,11 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) + (import "env" "table" (table 0 funcref)) (import "env" "globally" (global $i-collide 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)) - (global $g-collide-mut (mut i32) (get_global $i-collide)) + (global $a i32 (global.get $i-collide)) + (global $a-mut (mut i32) (global.get $i-collide)) + (global $g-collide i32 (global.get $i-collide)) + (global $g-collide-mut (mut i32) (global.get $i-collide)) ) diff --git a/test/merge/global-init.wast.combined b/test/merge/global-init.wast.combined index 3fb947e84..deb4d2635 100644 --- a/test/merge/global-init.wast.combined +++ b/test/merge/global-init.wast.combined @@ -1,7 +1,7 @@ (module (import "env" "memory" (memory $0 256)) - (data (get_global $__memory_base) "") - (import "env" "table" (table $0 0 anyfunc)) + (data (global.get $__memory_base) "") + (import "env" "table" (table $0 0 funcref)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) @@ -12,12 +12,12 @@ (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)) - (global $g-collide-mut (mut i32) (get_global $i-collide)) - (global $b f64 (get_global $i-collide$0)) - (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)) + (global $a i32 (global.get $i-collide)) + (global $a-mut (mut i32) (global.get $i-collide)) + (global $g-collide i32 (global.get $i-collide)) + (global $g-collide-mut (mut i32) (global.get $i-collide)) + (global $b f64 (global.get $i-collide$0)) + (global $b-mut (mut f64) (global.get $i-collide$0)) + (global $g-collide$0 f64 (global.get $i-collide$0)) + (global $g-collide-mut$0 (mut f64) (global.get $i-collide$0)) ) diff --git a/test/merge/global-init.wast.combined.finalized b/test/merge/global-init.wast.combined.finalized index 316e28620..bbebd4dd5 100644 --- a/test/merge/global-init.wast.combined.finalized +++ b/test/merge/global-init.wast.combined.finalized @@ -1,7 +1,7 @@ (module (import "env" "memory" (memory $0 256)) (data (i32.const 1024) "") - (import "env" "table" (table $0 8 anyfunc)) + (import "env" "table" (table $0 8 funcref)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) @@ -12,12 +12,12 @@ (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)) - (global $g-collide-mut (mut i32) (get_global $i-collide)) - (global $b f64 (get_global $i-collide$0)) - (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)) + (global $a i32 (global.get $i-collide)) + (global $a-mut (mut i32) (global.get $i-collide)) + (global $g-collide i32 (global.get $i-collide)) + (global $g-collide-mut (mut i32) (global.get $i-collide)) + (global $b f64 (global.get $i-collide$0)) + (global $b-mut (mut f64) (global.get $i-collide$0)) + (global $g-collide$0 f64 (global.get $i-collide$0)) + (global $g-collide-mut$0 (mut f64) (global.get $i-collide$0)) ) diff --git a/test/merge/global-init.wast.combined.finalized.opt b/test/merge/global-init.wast.combined.finalized.opt index cd3ab7e98..ed7bcd6cb 100644 --- a/test/merge/global-init.wast.combined.finalized.opt +++ b/test/merge/global-init.wast.combined.finalized.opt @@ -1,4 +1,4 @@ (module (import "env" "memory" (memory $0 256)) - (import "env" "table" (table $0 8 anyfunc)) + (import "env" "table" (table $0 8 funcref)) ) diff --git a/test/merge/global-init.wast.combined.opt b/test/merge/global-init.wast.combined.opt index 16a998b41..797b1b82b 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 $__memory_base) "") - (import "env" "table" (table $0 0 anyfunc)) + (data (global.get $__memory_base) "") + (import "env" "table" (table $0 0 funcref)) (import "env" "__memory_base" (global $__memory_base i32)) (import "env" "__table_base" (global $__table_base i32)) ) diff --git a/test/merge/global-init.wast.toMerge b/test/merge/global-init.wast.toMerge index b4efd3ca4..80f450dae 100644 --- a/test/merge/global-init.wast.toMerge +++ b/test/merge/global-init.wast.toMerge @@ -2,11 +2,11 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) + (import "env" "table" (table 0 funcref)) (import "env" "globally" (global $i-collide f64)) - (global $b f64 (get_global $i-collide)) - (global $b-mut (mut f64) (get_global $i-collide)) - (global $g-collide f64 (get_global $i-collide)) - (global $g-collide-mut (mut f64) (get_global $i-collide)) + (global $b f64 (global.get $i-collide)) + (global $b-mut (mut f64) (global.get $i-collide)) + (global $g-collide f64 (global.get $i-collide)) + (global $g-collide-mut (mut f64) (global.get $i-collide)) ) diff --git a/test/merge/main-lacks-segments.wast b/test/merge/main-lacks-segments.wast index c18db2470..7357e96e9 100644 --- a/test/merge/main-lacks-segments.wast +++ b/test/merge/main-lacks-segments.wast @@ -2,6 +2,6 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) + (import "env" "table" (table 0 funcref)) ) diff --git a/test/merge/main-lacks-segments.wast.combined b/test/merge/main-lacks-segments.wast.combined index 648b2797b..d48a8f812 100644 --- a/test/merge/main-lacks-segments.wast.combined +++ b/test/merge/main-lacks-segments.wast.combined @@ -1,9 +1,9 @@ (module (type $0 (func)) (import "env" "memory" (memory $0 256)) - (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 $__table_base) $foo $foo) + (data (global.get $__memory_base) "hello, this is some data!\00\00\00\00\00\00\00") + (import "env" "table" (table $0 2 funcref)) + (elem (global.get $__table_base) $foo $foo) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "__memory_base" (global $__memory_base i32)) @@ -14,10 +14,10 @@ (import "env" "__table_base" (global $__table_base$0 i32)) (func $foo (; 0 ;) (type $0) (drop - (get_global $tableBase$0) + (global.get $tableBase$0) ) (drop - (get_global $memoryBase$0) + (global.get $memoryBase$0) ) ) ) diff --git a/test/merge/main-lacks-segments.wast.combined.finalized b/test/merge/main-lacks-segments.wast.combined.finalized index dd36cd0d6..48ed4f341 100644 --- a/test/merge/main-lacks-segments.wast.combined.finalized +++ b/test/merge/main-lacks-segments.wast.combined.finalized @@ -2,7 +2,7 @@ (type $0 (func)) (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 $0 10 anyfunc)) + (import "env" "table" (table $0 10 funcref)) (elem (i32.const 8) $foo $foo) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) @@ -14,10 +14,10 @@ (import "env" "__table_base" (global $__table_base$0 i32)) (func $foo (; 0 ;) (type $0) (drop - (get_global $tableBase$0) + (global.get $tableBase$0) ) (drop - (get_global $memoryBase$0) + (global.get $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 41136cf95..fa8af7d41 100644 --- a/test/merge/main-lacks-segments.wast.combined.finalized.opt +++ b/test/merge/main-lacks-segments.wast.combined.finalized.opt @@ -2,16 +2,16 @@ (type $0 (func)) (import "env" "memory" (memory $0 256)) (data (i32.const 1024) "hello, this is some data!") - (import "env" "table" (table $0 10 anyfunc)) + (import "env" "table" (table $0 10 funcref)) (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) (drop - (get_global $tableBase$0) + (global.get $tableBase$0) ) (drop - (get_global $memoryBase$0) + (global.get $memoryBase$0) ) ) ) diff --git a/test/merge/main-lacks-segments.wast.combined.opt b/test/merge/main-lacks-segments.wast.combined.opt index d70d24209..c203b092a 100644 --- a/test/merge/main-lacks-segments.wast.combined.opt +++ b/test/merge/main-lacks-segments.wast.combined.opt @@ -1,19 +1,19 @@ (module (type $0 (func)) (import "env" "memory" (memory $0 256)) - (data (get_global $__memory_base) "hello, this is some data!") - (import "env" "table" (table $0 2 anyfunc)) - (elem (get_global $__table_base) $foo $foo) + (data (global.get $__memory_base) "hello, this is some data!") + (import "env" "table" (table $0 2 funcref)) + (elem (global.get $__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) (drop - (get_global $tableBase$0) + (global.get $tableBase$0) ) (drop - (get_global $memoryBase$0) + (global.get $memoryBase$0) ) ) ) diff --git a/test/merge/main-lacks-segments.wast.toMerge b/test/merge/main-lacks-segments.wast.toMerge index 63c2c3a3a..a35c605db 100644 --- a/test/merge/main-lacks-segments.wast.toMerge +++ b/test/merge/main-lacks-segments.wast.toMerge @@ -2,12 +2,12 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) - (elem (get_global $tableBase) $foo) - (data (get_global $memoryBase) "hello, this is some data!") + (import "env" "table" (table 0 funcref)) + (elem (global.get $tableBase) $foo) + (data (global.get $memoryBase) "hello, this is some data!") (func $foo - (drop (get_global $tableBase)) - (drop (get_global $memoryBase)) + (drop (global.get $tableBase)) + (drop (global.get $memoryBase)) ) ) diff --git a/test/merge/noBases.wast b/test/merge/noBases.wast index e6a8d1f14..41d5694ef 100644 --- a/test/merge/noBases.wast +++ b/test/merge/noBases.wast @@ -1,7 +1,7 @@ (module (type $ii (func (param i32 i32))) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 1000 anyfunc)) + (import "env" "table" (table 1000 funcref)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) (data (i32.const 100) "hello, A!\n") @@ -22,9 +22,9 @@ (i32.const 456) (i32.const 789) ) - (drop (get_global $global-collide)) - (drop (get_global $global-a)) - (set_global $global-collide-mut (i32.const 1234)) + (drop (global.get $global-collide)) + (drop (global.get $global-a)) + (global.set $global-collide-mut (i32.const 1234)) ) (func $willCollide (drop (i32.const 200)) diff --git a/test/merge/noBases.wast.combined b/test/merge/noBases.wast.combined index 3fb42a68b..db9b546ce 100644 --- a/test/merge/noBases.wast.combined +++ b/test/merge/noBases.wast.combined @@ -5,9 +5,9 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memory" (memory $0 256)) (data (i32.const 100) "hello, A!\n") - (data (get_global $__memory_base) "") + (data (global.get $__memory_base) "") (data (i32.const 200) "hello, B!\n") - (import "env" "table" (table $0 1000 anyfunc)) + (import "env" "table" (table $0 1000 funcref)) (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" "__memory_base" (global $__memory_base i32)) @@ -42,12 +42,12 @@ (i32.const 789) ) (drop - (get_global $global-collide) + (global.get $global-collide) ) (drop - (get_global $global-a) + (global.get $global-a) ) - (set_global $global-collide-mut + (global.set $global-collide-mut (i32.const 1234) ) ) @@ -70,12 +70,12 @@ (i32.const 56) ) (drop - (get_global $global-collide$0) + (global.get $global-collide$0) ) (drop - (get_global $global-b) + (global.get $global-b) ) - (set_global $global-collide-mut$0 + (global.set $global-collide-mut$0 (i32.const 5678) ) ) diff --git a/test/merge/noBases.wast.combined.finalized b/test/merge/noBases.wast.combined.finalized index aa456c16a..62ca6dc06 100644 --- a/test/merge/noBases.wast.combined.finalized +++ b/test/merge/noBases.wast.combined.finalized @@ -7,7 +7,7 @@ (data (i32.const 100) "hello, A!\n") (data (i32.const 1024) "") (data (i32.const 200) "hello, B!\n") - (import "env" "table" (table $0 1000 anyfunc)) + (import "env" "table" (table $0 1000 funcref)) (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" "__memory_base" (global $__memory_base i32)) @@ -42,12 +42,12 @@ (i32.const 789) ) (drop - (get_global $global-collide) + (global.get $global-collide) ) (drop - (get_global $global-a) + (global.get $global-a) ) - (set_global $global-collide-mut + (global.set $global-collide-mut (i32.const 1234) ) ) @@ -70,12 +70,12 @@ (i32.const 56) ) (drop - (get_global $global-collide$0) + (global.get $global-collide$0) ) (drop - (get_global $global-b) + (global.get $global-b) ) - (set_global $global-collide-mut$0 + (global.set $global-collide-mut$0 (i32.const 5678) ) ) diff --git a/test/merge/noBases.wast.combined.finalized.opt b/test/merge/noBases.wast.combined.finalized.opt index 8504d0d98..b05e78310 100644 --- a/test/merge/noBases.wast.combined.finalized.opt +++ b/test/merge/noBases.wast.combined.finalized.opt @@ -4,7 +4,7 @@ (import "env" "memory" (memory $0 256)) (data (i32.const 100) "hello, A!\n") (data (i32.const 200) "hello, B!\n") - (import "env" "table" (table $0 1000 anyfunc)) + (import "env" "table" (table $0 1000 funcref)) (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)) @@ -30,7 +30,7 @@ ) (nop) (nop) - (set_global $global-collide-mut + (global.set $global-collide-mut (i32.const 1234) ) ) @@ -50,7 +50,7 @@ ) (nop) (nop) - (set_global $global-collide-mut$0 + (global.set $global-collide-mut$0 (i32.const 5678) ) ) diff --git a/test/merge/noBases.wast.combined.opt b/test/merge/noBases.wast.combined.opt index f36c64cd2..f20b16336 100644 --- a/test/merge/noBases.wast.combined.opt +++ b/test/merge/noBases.wast.combined.opt @@ -3,9 +3,9 @@ (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) (data (i32.const 100) "hello, A!\n") - (data (get_global $__memory_base) "") + (data (global.get $__memory_base) "") (data (i32.const 200) "hello, B!\n") - (import "env" "table" (table $0 1000 anyfunc)) + (import "env" "table" (table $0 1000 funcref)) (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" "__memory_base" (global $__memory_base i32)) @@ -33,7 +33,7 @@ ) (nop) (nop) - (set_global $global-collide-mut + (global.set $global-collide-mut (i32.const 1234) ) ) @@ -53,7 +53,7 @@ ) (nop) (nop) - (set_global $global-collide-mut$0 + (global.set $global-collide-mut$0 (i32.const 5678) ) ) diff --git a/test/merge/noBases.wast.toMerge b/test/merge/noBases.wast.toMerge index 59f96c043..6e6145a15 100644 --- a/test/merge/noBases.wast.toMerge +++ b/test/merge/noBases.wast.toMerge @@ -1,7 +1,7 @@ (module (type $ii (func (param i32 i32))) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 1000 anyfunc)) + (import "env" "table" (table 1000 funcref)) (import "env" "some-func-b" (func $some-func-b)) (import "env" "some-collide" (func $some-collide)) (data (i32.const 200) "hello, B!\n") @@ -23,9 +23,9 @@ (i32.const 34) (i32.const 56) ) - (drop (get_global $global-collide)) - (drop (get_global $global-b)) - (set_global $global-collide-mut (i32.const 5678)) + (drop (global.get $global-collide)) + (drop (global.get $global-b)) + (global.set $global-collide-mut (i32.const 5678)) ) (func $willCollide (drop (i32.const 222)) diff --git a/test/merge/printf.wast b/test/merge/printf.wast index c984602bf..c57eabe51 100644 --- a/test/merge/printf.wast +++ b/test/merge/printf.wast @@ -2,7 +2,7 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) + (import "env" "table" (table 0 funcref)) (import "env" "globally" (global $i-collide i32)) (import "env" "foobar" (func $import$8 (param i32 i32) (result i32))) (export "_printf" (func $625)) diff --git a/test/merge/printf.wast.combined b/test/merge/printf.wast.combined index e7e8dff94..0ae24b16c 100644 --- a/test/merge/printf.wast.combined +++ b/test/merge/printf.wast.combined @@ -3,8 +3,8 @@ (type $FUNCSIG$iii$0 (func (param i32 i32) (result i32))) (type $1 (func)) (import "env" "memory" (memory $0 256)) - (data (get_global $__memory_base) "") - (import "env" "table" (table $0 0 anyfunc)) + (data (global.get $__memory_base) "") + (import "env" "table" (table $0 0 funcref)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) diff --git a/test/merge/printf.wast.combined.finalized b/test/merge/printf.wast.combined.finalized index b4c329749..d70fc9c99 100644 --- a/test/merge/printf.wast.combined.finalized +++ b/test/merge/printf.wast.combined.finalized @@ -4,7 +4,7 @@ (type $1 (func)) (import "env" "memory" (memory $0 256)) (data (i32.const 1024) "") - (import "env" "table" (table $0 8 anyfunc)) + (import "env" "table" (table $0 8 funcref)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "globally" (global $i-collide i32)) diff --git a/test/merge/printf.wast.combined.finalized.opt b/test/merge/printf.wast.combined.finalized.opt index 2eb0cbf2a..0a75c1ad9 100644 --- a/test/merge/printf.wast.combined.finalized.opt +++ b/test/merge/printf.wast.combined.finalized.opt @@ -1,7 +1,7 @@ (module (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table $0 8 anyfunc)) + (import "env" "table" (table $0 8 funcref)) (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 b/test/merge/printf.wast.combined.opt index a5c6458ef..1ba164fc0 100644 --- a/test/merge/printf.wast.combined.opt +++ b/test/merge/printf.wast.combined.opt @@ -1,8 +1,8 @@ (module (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (import "env" "memory" (memory $0 256)) - (data (get_global $__memory_base) "") - (import "env" "table" (table $0 0 anyfunc)) + (data (global.get $__memory_base) "") + (import "env" "table" (table $0 0 funcref)) (import "env" "__memory_base" (global $__memory_base i32)) (import "env" "__table_base" (global $__table_base i32)) (export "_printf" (func $625)) diff --git a/test/merge/printf.wast.toMerge b/test/merge/printf.wast.toMerge index d394abe34..c3e87eb73 100644 --- a/test/merge/printf.wast.toMerge +++ b/test/merge/printf.wast.toMerge @@ -2,7 +2,7 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "memory" (memory $0 256)) - (import "env" "table" (table 0 anyfunc)) + (import "env" "table" (table 0 funcref)) (import "env" "globally" (global $i-collide f64)) (import "env" "_printf" (func $import$8 (param i32 i32) (result i32))) (func $b |