diff options
Diffstat (limited to 'test/merge')
-rw-r--r-- | test/merge/basics.wast | 2 | ||||
-rw-r--r-- | test/merge/basics.wast.combined | 8 | ||||
-rw-r--r-- | test/merge/basics.wast.combined.finalized | 8 | ||||
-rw-r--r-- | test/merge/basics.wast.combined.finalized.opt | 20 | ||||
-rw-r--r-- | test/merge/basics.wast.combined.opt | 20 | ||||
-rw-r--r-- | test/merge/basics.wast.toMerge | 2 | ||||
-rw-r--r-- | test/merge/fusing.wast.combined.finalized.opt | 14 | ||||
-rw-r--r-- | test/merge/fusing.wast.combined.opt | 14 | ||||
-rw-r--r-- | test/merge/global-init.wast | 2 | ||||
-rw-r--r-- | test/merge/global-init.wast.combined | 4 | ||||
-rw-r--r-- | test/merge/global-init.wast.combined.finalized | 4 | ||||
-rw-r--r-- | test/merge/global-init.wast.toMerge | 2 | ||||
-rw-r--r-- | test/merge/noBases.wast.combined.finalized.opt | 20 | ||||
-rw-r--r-- | test/merge/noBases.wast.combined.opt | 20 |
14 files changed, 60 insertions, 80 deletions
diff --git a/test/merge/basics.wast b/test/merge/basics.wast index b5fc97f7e..920c1e977 100644 --- a/test/merge/basics.wast +++ b/test/merge/basics.wast @@ -10,6 +10,7 @@ (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) (export "exp-a" (func $only-a)) (export "exp-collide" (func $only-a)) @@ -26,6 +27,7 @@ ) (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)) diff --git a/test/merge/basics.wast.combined b/test/merge/basics.wast.combined index e90b4f594..a0d1ea7db 100644 --- a/test/merge/basics.wast.combined +++ b/test/merge/basics.wast.combined @@ -16,9 +16,11 @@ (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)) (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)) + (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)) @@ -45,6 +47,9 @@ (get_global $global-a) ) (drop + (get_global $global-a-mut) + ) + (drop (get_global $memoryBase) ) (drop @@ -79,6 +84,9 @@ (get_global $global-b) ) (drop + (get_global $global-b-mut) + ) + (drop (i32.add (get_global $memoryBase$0) (i32.const 16) diff --git a/test/merge/basics.wast.combined.finalized b/test/merge/basics.wast.combined.finalized index e25d70a6e..f68e8c808 100644 --- a/test/merge/basics.wast.combined.finalized +++ b/test/merge/basics.wast.combined.finalized @@ -16,9 +16,11 @@ (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)) (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)) + (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)) @@ -45,6 +47,9 @@ (get_global $global-a) ) (drop + (get_global $global-a-mut) + ) + (drop (i32.const 1024) ) (drop @@ -79,6 +84,9 @@ (get_global $global-b) ) (drop + (get_global $global-b-mut) + ) + (drop (i32.add (i32.const 1024) (i32.const 16) diff --git a/test/merge/basics.wast.combined.finalized.opt b/test/merge/basics.wast.combined.finalized.opt index d023ca183..a117042bb 100644 --- a/test/merge/basics.wast.combined.finalized.opt +++ b/test/merge/basics.wast.combined.finalized.opt @@ -7,12 +7,10 @@ (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-a-mut (mut i32) (i32.const 1)) (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") (export "exp-a" (func $only-a)) @@ -30,11 +28,10 @@ (i32.const 456) (i32.const 789) ) + (nop) + (nop) (drop - (get_global $global-collide) - ) - (drop - (get_global $global-a) + (get_global $global-a-mut) ) (nop) (nop) @@ -56,11 +53,10 @@ (i32.const 34) (i32.const 56) ) + (nop) + (nop) (drop - (get_global $global-collide$0) - ) - (drop - (get_global $global-b) + (get_global $global-b-mut) ) (nop) (nop) diff --git a/test/merge/basics.wast.combined.opt b/test/merge/basics.wast.combined.opt index beddc7e0b..d940ad38e 100644 --- a/test/merge/basics.wast.combined.opt +++ b/test/merge/basics.wast.combined.opt @@ -11,12 +11,10 @@ (import "env" "tableBase" (global $tableBase$0 i32)) (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-a-mut (mut i32) (i32.const 1)) (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") (export "exp-a" (func $only-a)) @@ -34,11 +32,10 @@ (i32.const 456) (i32.const 789) ) + (nop) + (nop) (drop - (get_global $global-collide) - ) - (drop - (get_global $global-a) + (get_global $global-a-mut) ) (drop (get_global $memoryBase) @@ -64,11 +61,10 @@ (i32.const 34) (i32.const 56) ) + (nop) + (nop) (drop - (get_global $global-collide$0) - ) - (drop - (get_global $global-b) + (get_global $global-b-mut) ) (drop (i32.add diff --git a/test/merge/basics.wast.toMerge b/test/merge/basics.wast.toMerge index 954b95bce..97d4a73a3 100644 --- a/test/merge/basics.wast.toMerge +++ b/test/merge/basics.wast.toMerge @@ -10,6 +10,7 @@ (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) (export "exp-b" (func $only-b)) (export "exp-collide" (func $only-b)) @@ -27,6 +28,7 @@ ) (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 diff --git a/test/merge/fusing.wast.combined.finalized.opt b/test/merge/fusing.wast.combined.finalized.opt index 409fe83c4..9a07b683c 100644 --- a/test/merge/fusing.wast.combined.finalized.opt +++ b/test/merge/fusing.wast.combined.finalized.opt @@ -11,20 +11,10 @@ (func $foo-func (; 0 ;) (type $FUNCSIG$v) (nop) (call $bar-func) - (drop - (get_global $a-global) - ) - (drop - (get_global $b-global) - ) + (nop) + (nop) ) (func $bar-func (; 1 ;) (type $FUNCSIG$v) (nop) - (drop - (get_global $a-global) - ) - (drop - (get_global $b-global) - ) ) ) diff --git a/test/merge/fusing.wast.combined.opt b/test/merge/fusing.wast.combined.opt index d2fed3cbd..c27ab0228 100644 --- a/test/merge/fusing.wast.combined.opt +++ b/test/merge/fusing.wast.combined.opt @@ -14,20 +14,10 @@ (func $foo-func (; 0 ;) (type $FUNCSIG$v) (nop) (call $bar-func) - (drop - (get_global $a-global) - ) - (drop - (get_global $b-global) - ) + (nop) + (nop) ) (func $bar-func (; 1 ;) (type $FUNCSIG$v) (nop) - (drop - (get_global $a-global) - ) - (drop - (get_global $b-global) - ) ) ) diff --git a/test/merge/global-init.wast b/test/merge/global-init.wast index ddf1a868f..532aafd76 100644 --- a/test/merge/global-init.wast +++ b/test/merge/global-init.wast @@ -5,6 +5,8 @@ (import "env" "table" (table 0 anyfunc)) (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)) ) diff --git a/test/merge/global-init.wast.combined b/test/merge/global-init.wast.combined index 0361e567f..095d6056b 100644 --- a/test/merge/global-init.wast.combined +++ b/test/merge/global-init.wast.combined @@ -8,8 +8,12 @@ (import "env" "tableBase" (global $tableBase$0 i32)) (import "env" "globally" (global $i-collide$0 f64)) (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)) (data (get_global $memoryBase) "") ) diff --git a/test/merge/global-init.wast.combined.finalized b/test/merge/global-init.wast.combined.finalized index c60d28850..832e86457 100644 --- a/test/merge/global-init.wast.combined.finalized +++ b/test/merge/global-init.wast.combined.finalized @@ -8,8 +8,12 @@ (import "env" "tableBase" (global $tableBase$0 i32)) (import "env" "globally" (global $i-collide$0 f64)) (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)) (data (i32.const 1024) "") ) diff --git a/test/merge/global-init.wast.toMerge b/test/merge/global-init.wast.toMerge index 6f5d5e6dd..b4efd3ca4 100644 --- a/test/merge/global-init.wast.toMerge +++ b/test/merge/global-init.wast.toMerge @@ -5,6 +5,8 @@ (import "env" "table" (table 0 anyfunc)) (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)) ) diff --git a/test/merge/noBases.wast.combined.finalized.opt b/test/merge/noBases.wast.combined.finalized.opt index 95e42c10d..8f8433211 100644 --- a/test/merge/noBases.wast.combined.finalized.opt +++ b/test/merge/noBases.wast.combined.finalized.opt @@ -7,12 +7,8 @@ (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") @@ -32,12 +28,8 @@ (i32.const 456) (i32.const 789) ) - (drop - (get_global $global-collide) - ) - (drop - (get_global $global-a) - ) + (nop) + (nop) (set_global $global-collide-mut (i32.const 1234) ) @@ -56,12 +48,8 @@ (i32.const 34) (i32.const 56) ) - (drop - (get_global $global-collide$0) - ) - (drop - (get_global $global-b) - ) + (nop) + (nop) (set_global $global-collide-mut$0 (i32.const 5678) ) diff --git a/test/merge/noBases.wast.combined.opt b/test/merge/noBases.wast.combined.opt index d844aa292..921cf5f9b 100644 --- a/test/merge/noBases.wast.combined.opt +++ b/test/merge/noBases.wast.combined.opt @@ -9,12 +9,8 @@ (import "env" "tableBase" (global $tableBase i32)) (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") @@ -35,12 +31,8 @@ (i32.const 456) (i32.const 789) ) - (drop - (get_global $global-collide) - ) - (drop - (get_global $global-a) - ) + (nop) + (nop) (set_global $global-collide-mut (i32.const 1234) ) @@ -59,12 +51,8 @@ (i32.const 34) (i32.const 56) ) - (drop - (get_global $global-collide$0) - ) - (drop - (get_global $global-b) - ) + (nop) + (nop) (set_global $global-collide-mut$0 (i32.const 5678) ) |