diff options
| author | Thomas Lively <tlively@google.com> | 2023-04-13 14:37:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-13 21:37:33 +0000 |
| commit | 34d5e785650101c5ccec8e99c514ad1033ca3624 (patch) | |
| tree | 45a3e7be4e5b69fdc6fc9f5fb2419b5f90506cfd /test/lit | |
| parent | d2ee08a8b59e6612b5477d99dc684add5639a70b (diff) | |
| download | binaryen-34d5e785650101c5ccec8e99c514ad1033ca3624.tar.gz binaryen-34d5e785650101c5ccec8e99c514ad1033ca3624.tar.bz2 binaryen-34d5e785650101c5ccec8e99c514ad1033ca3624.zip | |
Remove --nominal from more tests (#5664)
These tests were easy to remove --nominal from because they already worked with
the standard type system as well.
Diffstat (limited to 'test/lit')
| -rw-r--r-- | test/lit/passes/dae-gc-refine-params.wast | 210 | ||||
| -rw-r--r-- | test/lit/passes/dae-gc-refine-return.wast | 256 | ||||
| -rw-r--r-- | test/lit/passes/dae-gc.wast | 96 | ||||
| -rw-r--r-- | test/lit/passes/heap2local.wast | 1055 | ||||
| -rw-r--r-- | test/lit/passes/inlining_all-features.wast | 64 | ||||
| -rw-r--r-- | test/lit/passes/instrument-memory-gc.wast | 131 | ||||
| -rw-r--r-- | test/lit/passes/local-subtyping-nn.wast | 32 | ||||
| -rw-r--r-- | test/lit/passes/merge-similar-functions_types.wast | 110 | ||||
| -rw-r--r-- | test/lit/passes/name-types.wast | 9 | ||||
| -rw-r--r-- | test/lit/passes/optimize-instructions-gc-iit.wast | 198 | ||||
| -rw-r--r-- | test/lit/passes/optimize-instructions-gc.wast | 1067 | ||||
| -rw-r--r-- | test/lit/passes/precompute-gc.wast | 458 | ||||
| -rw-r--r-- | test/lit/passes/roundtrip-gc-types.wast | 11 | ||||
| -rw-r--r-- | test/lit/passes/roundtrip-gc.wast | 18 | ||||
| -rw-r--r-- | test/lit/passes/simplify-locals-gc.wast | 212 | ||||
| -rw-r--r-- | test/lit/passes/type-ssa.wast | 179 | ||||
| -rw-r--r-- | test/lit/tail-call.wast | 32 |
17 files changed, 83 insertions, 4055 deletions
diff --git a/test/lit/passes/dae-gc-refine-params.wast b/test/lit/passes/dae-gc-refine-params.wast index 29a666196..6ab0dc346 100644 --- a/test/lit/passes/dae-gc-refine-params.wast +++ b/test/lit/passes/dae-gc-refine-params.wast @@ -1,15 +1,11 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. ;; RUN: wasm-opt %s -all --dae -S -o - | filecheck %s -;; RUN: wasm-opt %s -all --dae --nominal -S -o - | filecheck %s --check-prefix NOMNL (module - ;; CHECK: (type ${} (struct )) - ;; NOMNL: (type ${} (struct )) (type ${} (struct)) ;; CHECK: (type ${i32} (struct_subtype (field i32) ${})) - ;; NOMNL: (type ${i32} (struct_subtype (field i32) ${})) (type ${i32} (struct_subtype (field i32) ${})) ;; CHECK: (type ${i32_i64} (struct_subtype (field i32) (field i64) ${i32})) @@ -17,14 +13,9 @@ ;; CHECK: (type ${i32_f32} (struct_subtype (field i32) (field f32) ${i32})) ;; CHECK: (type ${f64} (struct_subtype (field f64) ${})) - ;; NOMNL: (type ${i32_i64} (struct_subtype (field i32) (field i64) ${i32})) - - ;; NOMNL: (type ${i32_f32} (struct_subtype (field i32) (field f32) ${i32})) - - ;; NOMNL: (type ${f64} (struct_subtype (field f64) ${})) (type ${f64} (struct_subtype (field f64) ${})) -(type ${i32_i64} (struct_subtype (field i32) (field i64) ${i32})) + (type ${i32_i64} (struct_subtype (field i32) (field i64) ${i32})) (type ${i32_f32} (struct_subtype (field i32) (field f32) ${i32})) @@ -38,16 +29,6 @@ ;; CHECK-NEXT: (call $get_{f64}) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-various-params-no (type $none_=>_none) - ;; NOMNL-NEXT: (call $various-params-no - ;; NOMNL-NEXT: (call $get_{}) - ;; NOMNL-NEXT: (call $get_{i32}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $various-params-no - ;; NOMNL-NEXT: (call $get_{i32}) - ;; NOMNL-NEXT: (call $get_{f64}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-various-params-no ;; The first argument gets {} and {i32}; the second {i32} and {f64}; none of ;; those pairs can be optimized. Note that we do not pass in all nulls, as @@ -72,14 +53,6 @@ ;; CHECK-NEXT: (local.get $y) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $various-params-no (type $ref?|${}|_ref?|${}|_=>_none) (param $x (ref null ${})) (param $y (ref null ${})) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $various-params-no (param $x (ref null ${})) (param $y (ref null ${})) ;; "Use" the locals to avoid other optimizations kicking in. (drop (local.get $x)) @@ -89,27 +62,18 @@ ;; CHECK: (func $get_{} (type $none_=>_ref?|${}|) (result (ref null ${})) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $get_{} (type $none_=>_ref?|${}|) (result (ref null ${})) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $get_{} (result (ref null ${})) (unreachable) ) ;; CHECK: (func $get_{i32} (type $none_=>_ref?|${i32}|) (result (ref null ${i32})) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $get_{i32} (type $none_=>_ref?|${i32}|) (result (ref null ${i32})) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $get_{i32} (result (ref null ${i32})) (unreachable) ) ;; CHECK: (func $get_{f64} (type $none_=>_ref?|${f64}|) (result (ref null ${f64})) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $get_{f64} (type $none_=>_ref?|${f64}|) (result (ref null ${f64})) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $get_{f64} (result (ref null ${f64})) (unreachable) ) @@ -126,18 +90,6 @@ ;; CHECK-NEXT: (call $get_null_{i32_i64}) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-various-params-yes (type $none_=>_none) - ;; NOMNL-NEXT: (call $various-params-yes - ;; NOMNL-NEXT: (call $get_null_{i32}) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: (call $get_null_{i32}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $various-params-yes - ;; NOMNL-NEXT: (call $get_null_{i32}) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (call $get_null_{i32_i64}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-various-params-yes ;; The first argument gets {i32} and {i32}; the second {i32} and {i32_i64}; ;; both of those pairs can be optimized to {i32}. @@ -166,17 +118,6 @@ ;; CHECK-NEXT: (local.get $y) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $various-params-yes (type $ref?|${i32}|_i32_ref?|${i32}|_=>_none) (param $x (ref null ${i32})) (param $i i32) (param $y (ref null ${i32})) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $i) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $various-params-yes (param $x (ref null ${})) (param $i i32) (param $y (ref null ${})) ;; "Use" the locals to avoid other optimizations kicking in. (drop (local.get $x)) @@ -194,16 +135,6 @@ ;; CHECK-NEXT: (call $get_null_{i32_i64}) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-various-params-set (type $none_=>_none) - ;; NOMNL-NEXT: (call $various-params-set - ;; NOMNL-NEXT: (call $get_null_{i32}) - ;; NOMNL-NEXT: (call $get_null_{i32}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $various-params-set - ;; NOMNL-NEXT: (call $get_null_{i32}) - ;; NOMNL-NEXT: (call $get_null_{i32_i64}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-various-params-set ;; The first argument gets {i32} and {i32}; the second {i32} and {i32_i64; ;; both of those pairs can be optimized to {i32} @@ -245,32 +176,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $various-params-set (type $ref?|${i32}|_ref?|${i32}|_=>_none) (param $x (ref null ${i32})) (param $y (ref null ${i32})) - ;; NOMNL-NEXT: (local $2 (ref null ${})) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (struct.new_default ${}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $y - ;; NOMNL-NEXT: (call $get_null_{i32_i64}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $various-params-set (param $x (ref null ${})) (param $y (ref null ${})) ;; "Use" the locals to avoid other optimizations kicking in. (drop (local.get $x)) @@ -296,11 +201,6 @@ ;; CHECK-NEXT: (call $get_null_{i32}) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-various-params-tee (type $none_=>_none) - ;; NOMNL-NEXT: (call $various-params-tee - ;; NOMNL-NEXT: (call $get_null_{i32}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-various-params-tee ;; The argument gets {i32}, which allows us to refine. (call $various-params-tee @@ -319,18 +219,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $various-params-tee (type $ref?|${i32}|_=>_none) (param $x (ref null ${i32})) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref null ${i32})) - ;; NOMNL-NEXT: (local.tee $x - ;; NOMNL-NEXT: (call $get_null_{i32_i64}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $various-params-tee (param $x (ref null ${})) ;; "Use" the locals to avoid other optimizations kicking in. (drop (local.get $x)) @@ -360,22 +248,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-various-params-null (type $none_=>_none) - ;; NOMNL-NEXT: (call $various-params-null - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $get_null_{i32}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $various-params-null - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-various-params-null ;; The first argument gets non-null values, allowing us to refine it. The ;; second gets only one. @@ -402,18 +274,6 @@ ;; CHECK-NEXT: (local.get $temp) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $various-params-null (type $ref|none|_ref?|${i32}|_=>_none) (param $x (ref none)) (param $y (ref null ${i32})) - ;; NOMNL-NEXT: (local $temp i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (local.get $temp) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $various-params-null (param $x (ref null ${})) (param $y (ref null ${})) (local $temp i32) ;; "Use" the locals to avoid other optimizations kicking in. @@ -434,14 +294,6 @@ ;; CHECK-NEXT: (call $get_null_{i32_f32}) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-various-params-middle (type $none_=>_none) - ;; NOMNL-NEXT: (call $various-params-middle - ;; NOMNL-NEXT: (call $get_null_{i32_i64}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $various-params-middle - ;; NOMNL-NEXT: (call $get_null_{i32_f32}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-various-params-middle ;; The argument gets {i32_i64} and {i32_f32}. This allows us to refine from ;; {} to {i32}, a type "in the middle". @@ -457,11 +309,6 @@ ;; CHECK-NEXT: (local.get $x) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $various-params-middle (type $ref?|${i32}|_=>_none) (param $x (ref null ${i32})) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $various-params-middle (param $x (ref null ${})) ;; "Use" the local to avoid other optimizations kicking in. (drop (local.get $x)) @@ -471,10 +318,6 @@ ;; CHECK-NEXT: (local $0 structref) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $unused-and-refinable (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 structref) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $unused-and-refinable (param $0 structref) ;; This function does not use $0. It is called with ${}, so it is also ;; a parameter whose type we can refine. Do not do both operations: instead, @@ -490,9 +333,6 @@ ;; CHECK: (func $call-unused-and-refinable (type $none_=>_none) ;; CHECK-NEXT: (call $unused-and-refinable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-unused-and-refinable (type $none_=>_none) - ;; NOMNL-NEXT: (call $unused-and-refinable) - ;; NOMNL-NEXT: ) (func $call-unused-and-refinable (call $unused-and-refinable (struct.new_default ${}) @@ -508,15 +348,6 @@ ;; CHECK-NEXT: (local.get $1) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-nullable-fixup (type $ref|${}|_=>_none) (param $0 (ref ${})) - ;; NOMNL-NEXT: (local $1 structref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $non-nullable-fixup (param $0 structref) ;; Use the param to avoid other opts removing it, and to force us to do a ;; fixup when we refine the param's type. When doing so, we must handle the @@ -531,11 +362,6 @@ ;; CHECK-NEXT: (struct.new_default ${}) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-non-nullable-fixup (type $none_=>_none) - ;; NOMNL-NEXT: (call $non-nullable-fixup - ;; NOMNL-NEXT: (struct.new_default ${}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-non-nullable-fixup (call $non-nullable-fixup (struct.new_default ${}) @@ -550,14 +376,6 @@ ;; CHECK-NEXT: (struct.new_default ${}) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-update-null (type $none_=>_none) - ;; NOMNL-NEXT: (call $update-null - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $update-null - ;; NOMNL-NEXT: (struct.new_default ${}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-update-null ;; Call a function with one of the parameters a null of a type that we can ;; update in order to get a better LUB. @@ -574,11 +392,6 @@ ;; CHECK-NEXT: (local.get $x) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $update-null (type $ref?|${}|_=>_none) (param $x (ref null ${})) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $update-null (param $x (ref null any)) ;; "Use" the param to avoid other optimizations kicking in. We should only ;; see the type of the param refined to a null ${} after updating the null @@ -593,13 +406,6 @@ ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $get_null_{i32} (type $none_=>_ref?|${i32}|) (result (ref null ${i32})) - ;; NOMNL-NEXT: (select (result (ref null ${i32})) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: (struct.new_default ${i32}) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $get_null_{i32} (result (ref null ${i32})) ;; Helper function that returns a null value of ${i32}. We use this instead of ;; a direct ref.null because those can be rewritten by LUBFinder. @@ -617,13 +423,6 @@ ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $get_null_{i32_i64} (type $none_=>_ref?|${i32_i64}|) (result (ref null ${i32_i64})) - ;; NOMNL-NEXT: (select (result (ref null ${i32_i64})) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: (struct.new_default ${i32_i64}) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $get_null_{i32_i64} (result (ref null ${i32_i64})) (select (ref.null none) @@ -639,13 +438,6 @@ ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $get_null_{i32_f32} (type $none_=>_ref?|${i32_f32}|) (result (ref null ${i32_f32})) - ;; NOMNL-NEXT: (select (result (ref null ${i32_f32})) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: (struct.new_default ${i32_f32}) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $get_null_{i32_f32} (result (ref null ${i32_f32})) (select (ref.null none) diff --git a/test/lit/passes/dae-gc-refine-return.wast b/test/lit/passes/dae-gc-refine-return.wast index 0db6ab551..5aa3c0885 100644 --- a/test/lit/passes/dae-gc-refine-return.wast +++ b/test/lit/passes/dae-gc-refine-return.wast @@ -1,28 +1,20 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. ;; RUN: wasm-opt %s -all --dae -S -o - | filecheck %s -;; RUN: wasm-opt %s -all --dae --nominal -S -o - | filecheck %s --check-prefix NOMNL (module - ;; CHECK: (type ${} (struct )) - ;; NOMNL: (type $return_{} (func (result (ref ${})))) - - ;; NOMNL: (type ${} (struct )) (type ${} (struct)) ;; CHECK: (type $return_{} (func (result (ref ${})))) (type $return_{} (func (result (ref ${})))) ;; CHECK: (type ${i32} (struct_subtype (field i32) ${})) - ;; NOMNL: (type ${i32} (struct_subtype (field i32) ${})) (type ${i32} (struct_subtype (field i32) ${})) ;; CHECK: (type ${i32_f32} (struct_subtype (field i32) (field f32) ${i32})) - ;; NOMNL: (type ${i32_f32} (struct_subtype (field i32) (field f32) ${i32})) (type ${i32_f32} (struct_subtype (field i32) (field f32) ${i32})) ;; CHECK: (type ${i32_i64} (struct_subtype (field i32) (field i64) ${i32})) - ;; NOMNL: (type ${i32_i64} (struct_subtype (field i32) (field i64) ${i32})) (type ${i32_i64} (struct_subtype (field i32) (field i64) ${i32})) (table 1 1 funcref) @@ -35,20 +27,12 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refine-return-no-return (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (local $temp anyref) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (call $refine-return-no-return) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $refine-return-no-return (result anyref) ;; Call this function, so that we attempt to optimize it. Note that we do not ;; just drop the result, as that would cause the drop optimizations to kick ;; in. (local $temp anyref) (local.set $temp (call $refine-return-no-return)) - (unreachable) ) @@ -61,14 +45,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $any) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refine-return-no-refining (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (local $temp anyref) - ;; NOMNL-NEXT: (local $any anyref) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (call $refine-return-no-refining) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $any) - ;; NOMNL-NEXT: ) (func $refine-return-no-refining (result anyref) (local $temp anyref) (local $any anyref) @@ -87,14 +63,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $i31) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refine-return-flow (type $none_=>_i31ref) (result i31ref) - ;; NOMNL-NEXT: (local $temp anyref) - ;; NOMNL-NEXT: (local $i31 i31ref) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (call $refine-return-flow) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) (func $refine-return-flow (result anyref) (local $temp anyref) (local $i31 (ref null i31)) @@ -114,17 +82,6 @@ ;; CHECK-NEXT: (call $refine-return-flow) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-refine-return-flow (type $none_=>_i31ref) (result i31ref) - ;; NOMNL-NEXT: (local $temp anyref) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (call $call-refine-return-flow) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if (result i31ref) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (call $refine-return-flow) - ;; NOMNL-NEXT: (call $refine-return-flow) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-refine-return-flow (result anyref) (local $temp anyref) (local.set $temp (call $call-refine-return-flow)) @@ -150,16 +107,6 @@ ;; CHECK-NEXT: (local.get $i31) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refine-return-return (type $none_=>_i31ref) (result i31ref) - ;; NOMNL-NEXT: (local $temp anyref) - ;; NOMNL-NEXT: (local $i31 i31ref) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (call $refine-return-return) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $refine-return-return (result anyref) (local $temp anyref) (local $i31 (ref null i31)) @@ -190,26 +137,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $i31) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refine-return-many (type $none_=>_i31ref) (result i31ref) - ;; NOMNL-NEXT: (local $temp anyref) - ;; NOMNL-NEXT: (local $i31 i31ref) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (call $refine-return-many) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) (func $refine-return-many (result anyref) (local $temp anyref) (local $i31 (ref null i31)) @@ -248,27 +175,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $i31) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refine-return-many-lub (type $none_=>_eqref) (result eqref) - ;; NOMNL-NEXT: (local $temp anyref) - ;; NOMNL-NEXT: (local $i31 i31ref) - ;; NOMNL-NEXT: (local $struct structref) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (call $refine-return-many-lub) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) (func $refine-return-many-lub (result anyref) (local $temp anyref) (local $i31 (ref null i31)) @@ -309,27 +215,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $struct) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refine-return-many-lub-2 (type $none_=>_eqref) (result eqref) - ;; NOMNL-NEXT: (local $temp anyref) - ;; NOMNL-NEXT: (local $i31 i31ref) - ;; NOMNL-NEXT: (local $struct structref) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (call $refine-return-many-lub-2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) (func $refine-return-many-lub-2 (result anyref) (local $temp anyref) (local $i31 (ref null i31)) @@ -363,19 +248,6 @@ ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refine-return-tuple (type $none_=>_i31ref_i32) (result i31ref i32) - ;; NOMNL-NEXT: (local $temp anyref) - ;; NOMNL-NEXT: (local $i31 i31ref) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (tuple.extract 0 - ;; NOMNL-NEXT: (call $refine-return-tuple) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (tuple.make - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $refine-return-tuple (result anyref i32) (local $temp anyref) (local $i31 (ref null i31)) @@ -399,18 +271,12 @@ ;; CHECK: (func $do-return-call (type $none_=>_funcref) (result funcref) ;; CHECK-NEXT: (return_call $return-ref-func) ;; CHECK-NEXT: ) - ;; NOMNL: (func $do-return-call (type $none_=>_funcref) (result funcref) - ;; NOMNL-NEXT: (return_call $return-ref-func) - ;; NOMNL-NEXT: ) (func $do-return-call (result funcref) (return_call $return-ref-func) ) ;; CHECK: (func $return-ref-func (type $none_=>_ref|none_->_funcref|) (result (ref $none_=>_funcref)) ;; CHECK-NEXT: (ref.func $do-return-call) ;; CHECK-NEXT: ) - ;; NOMNL: (func $return-ref-func (type $none_=>_ref|none_->_funcref|) (result (ref $none_=>_funcref)) - ;; NOMNL-NEXT: (ref.func $do-return-call) - ;; NOMNL-NEXT: ) (func $return-ref-func (result funcref) (ref.func $do-return-call) ) @@ -420,18 +286,12 @@ ;; CHECK: (func $tail-callee (type $return_{}) (result (ref ${})) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-callee (type $return_{}) (result (ref ${})) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $tail-callee (result (ref ${})) (unreachable) ) ;; CHECK: (func $tail-caller-yes (type $return_{}) (result (ref ${})) ;; CHECK-NEXT: (return_call $tail-callee) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-caller-yes (type $return_{}) (result (ref ${})) - ;; NOMNL-NEXT: (return_call $tail-callee) - ;; NOMNL-NEXT: ) (func $tail-caller-yes (result anyref) ;; This function's return type can be refined because of this call, whose ;; target's return type is more specific than anyref. @@ -447,16 +307,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (return_call $tail-callee) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-caller-no (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (local $any anyref) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $any) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return_call $tail-callee) - ;; NOMNL-NEXT: ) (func $tail-caller-no (result anyref) (local $any anyref) @@ -475,14 +325,6 @@ ;; CHECK-NEXT: (call $tail-caller-no) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-call-caller (type $none_=>_none) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $tail-caller-yes) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $tail-caller-no) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $tail-call-caller ;; Call the functions to cause optimization to happen. (drop @@ -497,9 +339,6 @@ ;; CHECK: (func $tail-callee-indirect (type $return_{}) (result (ref ${})) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-callee-indirect (type $return_{}) (result (ref ${})) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $tail-callee-indirect (result (ref ${})) (unreachable) ) @@ -508,11 +347,6 @@ ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-caller-indirect-yes (type $return_{}) (result (ref ${})) - ;; NOMNL-NEXT: (return_call_indirect $0 (type $return_{}) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $tail-caller-indirect-yes (result anyref) (return_call_indirect (type $return_{}) (i32.const 0)) ) @@ -528,18 +362,6 @@ ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-caller-indirect-no (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (local $any anyref) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $any) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return_call_indirect $0 (type $return_{}) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $tail-caller-indirect-no (result anyref) (local $any anyref) @@ -556,14 +378,6 @@ ;; CHECK-NEXT: (call $tail-caller-indirect-no) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-call-caller-indirect (type $none_=>_none) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $tail-caller-indirect-yes) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $tail-caller-indirect-no) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $tail-call-caller-indirect (drop (call $tail-caller-indirect-yes) @@ -577,9 +391,6 @@ ;; CHECK: (func $tail-callee-call_ref (type $return_{}) (result (ref ${})) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-callee-call_ref (type $return_{}) (result (ref ${})) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $tail-callee-call_ref (result (ref ${})) (unreachable) ) @@ -589,12 +400,6 @@ ;; CHECK-NEXT: (local.get $return_{}) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-caller-call_ref-yes (type $return_{}) (result (ref ${})) - ;; NOMNL-NEXT: (local $return_{} (ref null $return_{})) - ;; NOMNL-NEXT: (return_call_ref $return_{} - ;; NOMNL-NEXT: (local.get $return_{}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $tail-caller-call_ref-yes (result anyref) (local $return_{} (ref null $return_{})) @@ -613,19 +418,6 @@ ;; CHECK-NEXT: (local.get $return_{}) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-caller-call_ref-no (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (local $any anyref) - ;; NOMNL-NEXT: (local $return_{} (ref null $return_{})) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $any) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return_call_ref $return_{} - ;; NOMNL-NEXT: (local.get $return_{}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $tail-caller-call_ref-no (result anyref) (local $any anyref) (local $return_{} (ref null $return_{})) @@ -643,14 +435,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-caller-call_ref-unreachable (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $tail-caller-call_ref-unreachable (result anyref) ;; An unreachable means there is no function signature to even look at. We ;; should not hit an assertion on such things. @@ -667,17 +451,6 @@ ;; CHECK-NEXT: (call $tail-caller-call_ref-unreachable) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tail-call-caller-call_ref (type $none_=>_none) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $tail-caller-call_ref-yes) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $tail-caller-call_ref-no) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $tail-caller-call_ref-unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $tail-call-caller-call_ref (drop (call $tail-caller-call_ref-yes) @@ -707,23 +480,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $update-null (type $i32_i32_=>_ref?|${i32}|) (param $x i32) (param $y i32) (result (ref null ${i32})) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (struct.new_default ${i32_f32}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (struct.new_default ${i32_i64}) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $update-null (param $x i32) (param $y i32) (result anyref) ;; Of the three returns here, the null can be updated, and the LUB is ;; determined by the other two, and is their shared parent ${}. @@ -750,18 +506,6 @@ ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-update-null (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $update-null - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $update-null - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-update-null (result anyref) ;; Call $update-null so it gets optimized. (Call it with various values so ;; that other opts do not inline the constants.) diff --git a/test/lit/passes/dae-gc.wast b/test/lit/passes/dae-gc.wast index 2100baa4c..97216ae8f 100644 --- a/test/lit/passes/dae-gc.wast +++ b/test/lit/passes/dae-gc.wast @@ -1,18 +1,13 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. ;; RUN: foreach %s %t wasm-opt -all --dae -S -o - | filecheck %s -;; RUN: foreach %s %t wasm-opt -all --dae --nominal -S -o - | filecheck %s --check-prefix=NOMNL (module ;; CHECK: (type ${} (struct )) - ;; NOMNL: (type ${} (struct )) (type ${} (struct)) ;; CHECK: (func $foo (type $none_=>_none) ;; CHECK-NEXT: (call $bar) ;; CHECK-NEXT: ) - ;; NOMNL: (func $foo (type $none_=>_none) - ;; NOMNL-NEXT: (call $bar) - ;; NOMNL-NEXT: ) (func $foo (call $bar (i31.new @@ -33,19 +28,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $bar (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 i31ref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.tee $0 - ;; NOMNL-NEXT: (i31.new - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.tee $0 - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $bar (param $0 i31ref) (drop ;; after the parameter is removed, we create a nullable local to replace it, @@ -71,19 +53,12 @@ ;; CHECK-NEXT: (local $0 (ref ${})) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $get-nonnull (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 (ref ${})) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $get-nonnull (param $0 (ref ${})) (nop) ) ;; CHECK: (func $send-nonnull (type $none_=>_none) ;; CHECK-NEXT: (call $get-nonnull) ;; CHECK-NEXT: ) - ;; NOMNL: (func $send-nonnull (type $none_=>_none) - ;; NOMNL-NEXT: (call $get-nonnull) - ;; NOMNL-NEXT: ) (func $send-nonnull (call $get-nonnull (struct.new ${}) @@ -107,20 +82,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $foo (type $ref|none_->_none|_=>_none) (param $0 (ref $none_=>_none)) - ;; NOMNL-NEXT: (local $1 (ref $none_=>_none)) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (ref.func $a) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $foo (param $x (ref func)) (param $y (ref func)) ;; "Use" the params to avoid other optimizations kicking in. (drop (local.get $x)) @@ -135,14 +96,6 @@ ;; CHECK-NEXT: (ref.func $c) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-foo (type $none_=>_none) - ;; NOMNL-NEXT: (call $foo - ;; NOMNL-NEXT: (ref.func $b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $foo - ;; NOMNL-NEXT: (ref.func $c) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-foo ;; Call $foo with a constant function in the first param, which we ;; can optimize, but different ones in the second. @@ -170,20 +123,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $bar (type $i31ref_=>_none) (param $0 i31ref) - ;; NOMNL-NEXT: (local $1 nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $bar (param $x (ref null any)) (param $y (ref null any)) ;; "Use" the params to avoid other optimizations kicking in. (drop (local.get $x)) @@ -200,16 +139,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-bar (type $none_=>_none) - ;; NOMNL-NEXT: (call $bar - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $bar - ;; NOMNL-NEXT: (i31.new - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $call-bar ;; Call with nulls. Mixing nulls is fine as they all have the same type and ;; value. However, mixing a null with a reference stops us in the second @@ -228,23 +157,14 @@ ;; CHECK: (func $a (type $none_=>_none) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $a (type $none_=>_none) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $a) ;; CHECK: (func $b (type $none_=>_none) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $b (type $none_=>_none) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $b) ;; CHECK: (func $c (type $none_=>_none) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $c (type $none_=>_none) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $c) ) @@ -253,9 +173,6 @@ ;; CHECK: (func $0 (type $none_=>_none) ;; CHECK-NEXT: (call $1) ;; CHECK-NEXT: ) - ;; NOMNL: (func $0 (type $none_=>_none) - ;; NOMNL-NEXT: (call $1) - ;; NOMNL-NEXT: ) (func $0 (call $1 (string.const "310") @@ -275,19 +192,6 @@ ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $1 (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 (ref string)) - ;; NOMNL-NEXT: (local $1 (ref string)) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (string.const "929") - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (string.const "310") - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $1 (param $0 (ref string)) (param $1 (ref string)) ;; The parameters here will be removed, and the constant values placed in the ;; function. diff --git a/test/lit/passes/heap2local.wast b/test/lit/passes/heap2local.wast index 1027420c4..a0f68b79f 100644 --- a/test/lit/passes/heap2local.wast +++ b/test/lit/passes/heap2local.wast @@ -2,19 +2,14 @@ ;; (remove-unused-names allows the pass to see that blocks flow values) ;; RUN: wasm-opt %s -all --remove-unused-names --heap2local -S -o - | filecheck %s -;; RUN: wasm-opt %s -all --remove-unused-names --heap2local --nominal -S -o - | filecheck %s --check-prefix=NOMNL (module ;; CHECK: (type $struct.A (struct (field (mut i32)) (field (mut f64)))) - ;; NOMNL: (type $struct.A (struct (field (mut i32)) (field (mut f64)))) (type $struct.A (struct (field (mut i32)) (field (mut f64)))) ;; CHECK: (type $struct.recursive (struct (field (mut (ref null $struct.recursive))))) ;; CHECK: (type $struct.packed (struct (field (mut i8)))) - ;; NOMNL: (type $struct.recursive (struct (field (mut (ref null $struct.recursive))))) - - ;; NOMNL: (type $struct.packed (struct (field (mut i8)))) (type $struct.packed (struct (field (mut i8)))) (type $struct.nondefaultable (struct (field (ref $struct.A)))) @@ -38,21 +33,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $simple (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 i32) - ;; NOMNL-NEXT: (local $1 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $simple ;; Other passes can remove such a trivial case of an unused allocation, but ;; we still optimize it. @@ -77,22 +57,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $to-local (type $none_=>_none) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $to-local (local $ref (ref null $struct.A)) ;; While set to a local, this allocation has no get/set operations. Other @@ -124,26 +88,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $one-get (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 i32) - ;; NOMNL-NEXT: (local $1 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $one-get ;; An allocation followed by an immediate get of a field. This is a non- ;; escaping allocation, with a use, so we can optimize it out. The @@ -177,26 +121,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $one-get-b (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 i32) - ;; NOMNL-NEXT: (local $1 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $one-get-b ;; Similar to the above, but using a different field index. (drop @@ -224,24 +148,6 @@ ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $one-set (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 i32) - ;; NOMNL-NEXT: (local $1 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $one-set ;; A simple optimizable allocation only used in one set. (struct.set $struct.A 0 @@ -257,13 +163,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $packed (type $none_=>_none) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.get_u $struct.packed 0 - ;; NOMNL-NEXT: (struct.new_default $struct.packed) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $packed ;; We do not optimize packed structs yet. (drop @@ -301,34 +200,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $with-init-values (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 i32) - ;; NOMNL-NEXT: (local $1 f64) - ;; NOMNL-NEXT: (local $2 i32) - ;; NOMNL-NEXT: (local $3 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $3 - ;; NOMNL-NEXT: (f64.const 3.14159) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (local.get $3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $with-init-values ;; When we get values to initialize the struct with, assign them to the ;; proper locals. @@ -360,24 +231,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ignore-unreachable (type $none_=>_none) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ignore-unreachable ;; An unreachable allocation is not worth trying to process; DCE should ;; remove it. @@ -411,26 +264,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $nondefaultable (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 (ref $struct.A)) - ;; NOMNL-NEXT: (local $1 (ref $struct.A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $struct.A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $nondefaultable ;; The non-nullable types here can fit in locals. (drop @@ -466,30 +299,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $simple-one-local-set (type $none_=>_none) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $simple-one-local-set (local $ref (ref null $struct.A)) ;; A simple optimizable allocation only used in one set, and also stored @@ -526,28 +335,6 @@ ;; CHECK-NEXT: (local.get $2) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $simple-one-local-get (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $simple-one-local-get (result f64) (local $ref (ref null $struct.A)) (local.set $ref @@ -562,9 +349,6 @@ ;; CHECK: (func $send-ref (type $ref?|$struct.A|_=>_none) (param $0 (ref null $struct.A)) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $send-ref (type $ref?|$struct.A|_=>_none) (param $0 (ref null $struct.A)) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $send-ref (param (ref null $struct.A)) ) @@ -593,31 +377,6 @@ ;; CHECK-NEXT: (local.get $2) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $safe-to-drop (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $safe-to-drop (result f64) (local $ref (ref null $struct.A)) (local.set $ref @@ -644,18 +403,6 @@ ;; CHECK-NEXT: (local.get $ref) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $escape-via-call (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local.set $ref - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $send-ref - ;; NOMNL-NEXT: (local.get $ref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $struct.A 1 - ;; NOMNL-NEXT: (local.get $ref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $escape-via-call (result f64) (local $ref (ref null $struct.A)) (local.set $ref @@ -699,35 +446,6 @@ ;; CHECK-NEXT: (local.get $2) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $safe-to-drop-multiflow (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $safe-to-drop-multiflow (result f64) (local $ref (ref null $struct.A)) (local.set $ref @@ -764,22 +482,6 @@ ;; CHECK-NEXT: (local.get $ref) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $escape-after-multiflow (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local.set $ref - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $send-ref - ;; NOMNL-NEXT: (block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (local.get $ref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $struct.A 1 - ;; NOMNL-NEXT: (local.get $ref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $escape-after-multiflow (result f64) (local $ref (ref null $struct.A)) (local.set $ref @@ -813,19 +515,6 @@ ;; CHECK-NEXT: (local.get $ref) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-exclusive-set (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local.set $ref - ;; NOMNL-NEXT: (select (result (ref $struct.A)) - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $struct.A 1 - ;; NOMNL-NEXT: (local.get $ref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $non-exclusive-set (result f64) (local $ref (ref null $struct.A)) ;; A set that receives two different allocations, and so we should not try @@ -867,31 +556,6 @@ ;; CHECK-NEXT: (local.get $2) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $local-copies (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $local-copies (result f64) (local $ref (ref null $struct.A)) (local.set $ref @@ -942,42 +606,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $local-copies-2 (type $none_=>_none) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $ref-2 (ref null $struct.A)) - ;; NOMNL-NEXT: (local $2 i32) - ;; NOMNL-NEXT: (local $3 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $3 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $local-copies-2 (local $ref (ref null $struct.A)) (local $ref-2 (ref null $struct.A)) @@ -1029,34 +657,6 @@ ;; CHECK-NEXT: (local.get $3) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $local-copies-conditional (type $i32_=>_f64) (param $x i32) (result f64) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $2 i32) - ;; NOMNL-NEXT: (local $3 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $3 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $local-copies-conditional (param $x i32) (result f64) (local $ref (ref null $struct.A)) (local.set $ref @@ -1102,33 +702,6 @@ ;; CHECK-NEXT: (local.get $2) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $block-value (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (call $send-ref - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $block-value (result f64) (local $ref (ref null $struct.A)) (local.set $ref @@ -1161,21 +734,6 @@ ;; CHECK-NEXT: (local.get $ref) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-exclusive-get (type $i32_=>_f64) (param $x i32) (result f64) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local.set $ref - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (local.set $ref - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $struct.A 1 - ;; NOMNL-NEXT: (local.get $ref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $non-exclusive-get (param $x i32) (result f64) (local $ref (ref null $struct.A)) (local.set $ref @@ -1210,23 +768,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $1) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tee (type $none_=>_i32) (result i32) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) (func $tee (result i32) (local $ref (ref null $struct.A)) (struct.get $struct.A 0 @@ -1252,21 +793,6 @@ ;; CHECK-NEXT: (ref.null none) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $tee-set (type $none_=>_none) - ;; NOMNL-NEXT: (local $ref (ref null $struct.recursive)) - ;; NOMNL-NEXT: (local $1 (ref null $struct.recursive)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $tee-set (local $ref (ref null $struct.recursive)) ;; As above, but with a set, and also a recursive type. @@ -1287,15 +813,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $set-value (type $ref?|$struct.recursive|_=>_none) (param $struct.recursive (ref null $struct.recursive)) - ;; NOMNL-NEXT: (local $ref (ref null $struct.recursive)) - ;; NOMNL-NEXT: (struct.set $struct.recursive 0 - ;; NOMNL-NEXT: (local.get $struct.recursive) - ;; NOMNL-NEXT: (local.tee $ref - ;; NOMNL-NEXT: (struct.new_default $struct.recursive) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $set-value (param $struct.recursive (ref null $struct.recursive)) (local $ref (ref null $struct.recursive)) (struct.set $struct.recursive 0 @@ -1332,30 +849,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $initialize-with-reference (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 (ref null $struct.recursive)) - ;; NOMNL-NEXT: (local $1 (ref null $struct.recursive)) - ;; NOMNL-NEXT: (local $2 (ref null $struct.recursive)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (struct.new_default $struct.recursive) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref null $struct.recursive)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $initialize-with-reference (local $0 (ref null $struct.recursive)) (local.set $0 @@ -1388,16 +881,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $ref) ;; CHECK-NEXT: ) - ;; NOMNL: (func $escape-flow-out (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (struct.set $struct.A 0 - ;; NOMNL-NEXT: (local.tee $ref - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $ref) - ;; NOMNL-NEXT: ) (func $escape-flow-out (result anyref) (local $ref (ref null $struct.A)) (struct.set $struct.A 0 @@ -1422,18 +905,6 @@ ;; CHECK-NEXT: (local.get $ref) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $escape-return (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (struct.set $struct.A 0 - ;; NOMNL-NEXT: (local.tee $ref - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (local.get $ref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $escape-return (result anyref) (local $ref (ref null $struct.A)) (struct.set $struct.A 0 @@ -1468,26 +939,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-nullable (type $ref|$struct.A|_=>_none) (param $a (ref $struct.A)) - ;; NOMNL-NEXT: (local $1 (ref $struct.A)) - ;; NOMNL-NEXT: (local $2 (ref $struct.A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $struct.A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (local.get $a) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $non-nullable (param $a (ref $struct.A)) (drop ;; An optimizable case where the type is non-nullable, which requires @@ -1594,100 +1045,6 @@ ;; CHECK-NEXT: (br $outer) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $before-loop-use-multi (type $i32_=>_none) (param $x i32) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $2 i32) - ;; NOMNL-NEXT: (local $3 f64) - ;; NOMNL-NEXT: (local $4 i32) - ;; NOMNL-NEXT: (local $5 f64) - ;; NOMNL-NEXT: (loop $outer - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $4 - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $5 - ;; NOMNL-NEXT: (f64.const 2.1828) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (local.get $4) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $3 - ;; NOMNL-NEXT: (local.get $5) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $3 - ;; NOMNL-NEXT: (f64.const 42) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (loop $inner - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (i32.add - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (br_if $inner - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (br $outer) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $before-loop-use-multi (param $x i32) (local $ref (ref null $struct.A)) ;; Allocate in a loop, and use that allocation multiple times in that loop @@ -1801,62 +1158,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $multi-separate (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 i32) - ;; NOMNL-NEXT: (local $1 f64) - ;; NOMNL-NEXT: (local $2 i32) - ;; NOMNL-NEXT: (local $3 f64) - ;; NOMNL-NEXT: (local $4 i32) - ;; NOMNL-NEXT: (local $5 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $3 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $4 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $5 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $5) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $multi-separate ;; Multiple independent things we can optimize. (drop @@ -1921,51 +1222,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $multi-separate-same-local-index (type $none_=>_none) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (local $3 i32) - ;; NOMNL-NEXT: (local $4 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $3 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $4 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $multi-separate-same-local-index (local $ref (ref null $struct.A)) ;; Multiple independent things we can optimize that use the same local @@ -2034,52 +1290,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $multi-separate-different-local-index-overlapping-lifetimes (type $none_=>_none) - ;; NOMNL-NEXT: (local $ref1 (ref null $struct.A)) - ;; NOMNL-NEXT: (local $ref2 (ref null $struct.A)) - ;; NOMNL-NEXT: (local $2 i32) - ;; NOMNL-NEXT: (local $3 f64) - ;; NOMNL-NEXT: (local $4 i32) - ;; NOMNL-NEXT: (local $5 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $3 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $4 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $5 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $4) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $multi-separate-different-local-index-overlapping-lifetimes (local $ref1 (ref null $struct.A)) (local $ref2 (ref null $struct.A)) @@ -2120,23 +1330,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $get-through-block (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $0 (ref null $struct.A)) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $struct.A 1 - ;; NOMNL-NEXT: (block $block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (br_if $block - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $get-through-block (result f64) (local $0 (ref null $struct.A)) (local.set $0 @@ -2176,23 +1369,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $branch-to-block (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $0 (ref null $struct.A)) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $struct.A 1 - ;; NOMNL-NEXT: (block $block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (br_if $block - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $branch-to-block (result f64) (local $0 (ref null $struct.A)) (local.set $0 @@ -2245,38 +1421,6 @@ ;; CHECK-NEXT: (local.get $2) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $branch-to-block-no-fallthrough (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $0 (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block (result f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block $block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (br_if $block - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (f64.const 2.1828) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $branch-to-block-no-fallthrough (result f64) (local $0 (ref null $struct.A)) (local.set $0 @@ -2323,31 +1467,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $two-branches (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $0 (ref null $struct.A)) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $struct.A 1 - ;; NOMNL-NEXT: (block $block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (br_if $block - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (br_if $block - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (f64.const 2.1828) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $two-branches (result f64) (local $0 (ref null $struct.A)) (local.set $0 @@ -2399,31 +1518,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $two-branches-b (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $0 (ref null $struct.A)) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $struct.A 1 - ;; NOMNL-NEXT: (block $block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (br_if $block - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (br_if $block - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (f64.const 2.1828) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $two-branches-b (result f64) (local $0 (ref null $struct.A)) (local.set $0 @@ -2470,25 +1564,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $br_if_flow (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $0 (ref null $struct.A)) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (struct.new_default $struct.A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $struct.A 1 - ;; NOMNL-NEXT: (block $block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (call $send-ref - ;; NOMNL-NEXT: (br_if $block - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (f64.const 2.1828) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $br_if_flow (result f64) (local $0 (ref null $struct.A)) (local.set $0 @@ -2539,35 +1614,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-as-non-null (type $none_=>_none) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-as-non-null (local $ref (ref null $struct.A)) (local.set $ref @@ -2615,31 +1661,6 @@ ;; CHECK-NEXT: (local.get $1) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-as-non-null-through-local (type $none_=>_i32) (result i32) - ;; NOMNL-NEXT: (local $ref (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-as-non-null-through-local (result i32) (local $ref (ref null $struct.A)) (local.set $ref @@ -2696,41 +1717,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $2) ;; CHECK-NEXT: ) - ;; NOMNL: (func $br_if-allocation (type $none_=>_f64) (result f64) - ;; NOMNL-NEXT: (local $0 (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (local $3 i32) - ;; NOMNL-NEXT: (local $4 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block $block (result (ref null $struct.A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (br_if $block - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $3 - ;; NOMNL-NEXT: (i32.const 42) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $4 - ;; NOMNL-NEXT: (f64.const 13.37) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (local.get $3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (local.get $4) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (f64.const 2.1828) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $2) - ;; NOMNL-NEXT: ) (func $br_if-allocation (result f64) (local $0 (ref null $struct.A)) (struct.get $struct.A 1 @@ -2772,27 +1758,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $pass-through-loop (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (loop $loop (result (ref null $struct.A)) - ;; NOMNL-NEXT: (br_if $loop - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $pass-through-loop (local $0 (ref null $struct.A)) ;; The allocation pass through a loop, which should change type to be @@ -2829,26 +1794,6 @@ ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-nullable-local (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (local $0 (ref null $struct.A)) - ;; NOMNL-NEXT: (local $1 i32) - ;; NOMNL-NEXT: (local $2 f64) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (local.set $1 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $2 - ;; NOMNL-NEXT: (f64.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $non-nullable-local (result anyref) (local $0 (ref $struct.A)) ;; The local.get here is in unreachable code, which means we won't do diff --git a/test/lit/passes/inlining_all-features.wast b/test/lit/passes/inlining_all-features.wast index eee8fbdc9..3cd7b0134 100644 --- a/test/lit/passes/inlining_all-features.wast +++ b/test/lit/passes/inlining_all-features.wast @@ -1,7 +1,6 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. ;; RUN: foreach %s %t wasm-opt --inlining --all-features -S -o - | filecheck %s -;; RUN: foreach %s %t wasm-opt --inlining --all-features --nominal -S -o - | filecheck %s --check-prefix=NOMNL (module ;; CHECK: (type $none_=>_none (func)) @@ -11,13 +10,6 @@ ;; CHECK: (elem declare func $foo) ;; CHECK: (export "ref_func_test" (func $ref_func_test)) - ;; NOMNL: (type $none_=>_none (func)) - - ;; NOMNL: (type $none_=>_funcref (func (result funcref))) - - ;; NOMNL: (elem declare func $foo) - - ;; NOMNL: (export "ref_func_test" (func $ref_func_test)) (export "ref_func_test" (func $ref_func_test)) ;; $foo should not be removed after being inlined, because there is 'ref.func' @@ -25,9 +17,6 @@ ;; CHECK: (func $foo (type $none_=>_none) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $foo (type $none_=>_none) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $foo) ;; CHECK: (func $ref_func_test (type $none_=>_funcref) (result funcref) @@ -38,14 +27,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (ref.func $foo) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref_func_test (type $none_=>_funcref) (result funcref) - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (block $__inlined_func$foo - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.func $foo) - ;; NOMNL-NEXT: ) (func $ref_func_test (result funcref) (call $foo) (ref.func $foo) @@ -55,20 +36,15 @@ (module ;; a function reference in a global's init should be noticed, and prevent us ;; from removing an inlined function + ;; CHECK: (type $none_=>_i32 (func (result i32))) ;; CHECK: (global $global$0 (mut funcref) (ref.func $0)) - ;; NOMNL: (type $none_=>_i32 (func (result i32))) - - ;; NOMNL: (global $global$0 (mut funcref) (ref.func $0)) (global $global$0 (mut funcref) (ref.func $0)) ;; CHECK: (func $0 (type $none_=>_i32) (result i32) ;; CHECK-NEXT: (i32.const 1337) ;; CHECK-NEXT: ) - ;; NOMNL: (func $0 (type $none_=>_i32) (result i32) - ;; NOMNL-NEXT: (i32.const 1337) - ;; NOMNL-NEXT: ) (func $0 (result i32) (i32.const 1337) ) @@ -78,11 +54,6 @@ ;; CHECK-NEXT: (i32.const 1337) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $1 (type $none_=>_i32) (result i32) - ;; NOMNL-NEXT: (block $__inlined_func$0 (result i32) - ;; NOMNL-NEXT: (i32.const 1337) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $1 (result i32) (call $0) ) @@ -91,20 +62,15 @@ (module ;; a function reference in the start should be noticed, and prevent us ;; from removing an inlined function + ;; CHECK: (type $none_=>_none (func)) ;; CHECK: (start $0) - ;; NOMNL: (type $none_=>_none (func)) - - ;; NOMNL: (start $0) (start $0) ;; CHECK: (func $0 (type $none_=>_none) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $0 (type $none_=>_none) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $0 (nop) ) @@ -114,11 +80,6 @@ ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $1 (type $none_=>_none) - ;; NOMNL-NEXT: (block $__inlined_func$0 - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $1 (call $0) ) @@ -127,11 +88,9 @@ ;; inline a return_call_ref (module ;; CHECK: (type $none_=>_none (func)) - ;; NOMNL: (type $none_=>_none (func)) (type $none_=>_none (func)) ;; CHECK: (export "func_36_invoker" (func $1)) - ;; NOMNL: (export "func_36_invoker" (func $1)) (export "func_36_invoker" (func $1)) (func $0 @@ -144,11 +103,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $1 (type $none_=>_none) - ;; NOMNL-NEXT: (block $__inlined_func$0 - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $1 (call $0) ) @@ -160,6 +114,7 @@ (func $0 (param $non-null (ref func)) (result (ref func)) (local.get $non-null) ) + ;; CHECK: (type $none_=>_ref|func| (func (result (ref func)))) ;; CHECK: (elem declare func $1) @@ -173,19 +128,6 @@ ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (type $none_=>_ref|func| (func (result (ref func)))) - - ;; NOMNL: (elem declare func $1) - - ;; NOMNL: (func $1 (type $none_=>_ref|func|) (result (ref func)) - ;; NOMNL-NEXT: (local $0 (ref func)) - ;; NOMNL-NEXT: (block $__inlined_func$0 (result (ref func)) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (ref.func $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $1 (result (ref func)) (call $0 (ref.func $1) diff --git a/test/lit/passes/instrument-memory-gc.wast b/test/lit/passes/instrument-memory-gc.wast index e1f04a095..4d78ebdda 100644 --- a/test/lit/passes/instrument-memory-gc.wast +++ b/test/lit/passes/instrument-memory-gc.wast @@ -1,7 +1,6 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. ;; RUN: foreach %s %t wasm-opt --instrument-memory -all -S -o - | filecheck %s -;; RUN: foreach %s %t wasm-opt --instrument-memory --nominal -all -S -o - | filecheck %s --check-prefix=NOMNL (module ;; CHECK: (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) @@ -13,22 +12,12 @@ ;; CHECK: (type $i32_f64_=>_f64 (func (param i32 f64) (result f64))) ;; CHECK: (type $struct (struct (field (mut i32)) (field f32) (field $named f64))) - ;; NOMNL: (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) - - ;; NOMNL: (type $i32_i64_=>_i64 (func (param i32 i64) (result i64))) - - ;; NOMNL: (type $i32_f32_=>_f32 (func (param i32 f32) (result f32))) - - ;; NOMNL: (type $i32_f64_=>_f64 (func (param i32 f64) (result f64))) - - ;; NOMNL: (type $struct (struct (field (mut i32)) (field f32) (field $named f64))) (type $struct (struct (field (mut i32)) (field f32) (field $named f64) )) ;; CHECK: (type $array (array (mut f64))) - ;; NOMNL: (type $array (array (mut f64))) (type $array (array (mut f64))) ;; CHECK: (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32))) @@ -126,101 +115,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32))) - - ;; NOMNL: (type $ref|$struct|_=>_none (func (param (ref $struct)))) - - ;; NOMNL: (type $ref|$array|_=>_none (func (param (ref $array)))) - - ;; NOMNL: (import "env" "load_ptr" (func $load_ptr (param i32 i32 i32 i32) (result i32))) - - ;; NOMNL: (import "env" "load_val_i32" (func $load_val_i32 (param i32 i32) (result i32))) - - ;; NOMNL: (import "env" "load_val_i64" (func $load_val_i64 (param i32 i64) (result i64))) - - ;; NOMNL: (import "env" "load_val_f32" (func $load_val_f32 (param i32 f32) (result f32))) - - ;; NOMNL: (import "env" "load_val_f64" (func $load_val_f64 (param i32 f64) (result f64))) - - ;; NOMNL: (import "env" "store_ptr" (func $store_ptr (param i32 i32 i32 i32) (result i32))) - - ;; NOMNL: (import "env" "store_val_i32" (func $store_val_i32 (param i32 i32) (result i32))) - - ;; NOMNL: (import "env" "store_val_i64" (func $store_val_i64 (param i32 i64) (result i64))) - - ;; NOMNL: (import "env" "store_val_f32" (func $store_val_f32 (param i32 f32) (result f32))) - - ;; NOMNL: (import "env" "store_val_f64" (func $store_val_f64 (param i32 f64) (result f64))) - - ;; NOMNL: (import "env" "struct_get_val_i32" (func $struct_get_val_i32 (param i32 i32) (result i32))) - - ;; NOMNL: (import "env" "struct_get_val_i64" (func $struct_get_val_i64 (param i32 i64) (result i64))) - - ;; NOMNL: (import "env" "struct_get_val_f32" (func $struct_get_val_f32 (param i32 f32) (result f32))) - - ;; NOMNL: (import "env" "struct_get_val_f64" (func $struct_get_val_f64 (param i32 f64) (result f64))) - - ;; NOMNL: (import "env" "struct_set_val_i32" (func $struct_set_val_i32 (param i32 i32) (result i32))) - - ;; NOMNL: (import "env" "struct_set_val_i64" (func $struct_set_val_i64 (param i32 i64) (result i64))) - - ;; NOMNL: (import "env" "struct_set_val_f32" (func $struct_set_val_f32 (param i32 f32) (result f32))) - - ;; NOMNL: (import "env" "struct_set_val_f64" (func $struct_set_val_f64 (param i32 f64) (result f64))) - - ;; NOMNL: (import "env" "array_get_val_i32" (func $array_get_val_i32 (param i32 i32) (result i32))) - - ;; NOMNL: (import "env" "array_get_val_i64" (func $array_get_val_i64 (param i32 i64) (result i64))) - - ;; NOMNL: (import "env" "array_get_val_f32" (func $array_get_val_f32 (param i32 f32) (result f32))) - - ;; NOMNL: (import "env" "array_get_val_f64" (func $array_get_val_f64 (param i32 f64) (result f64))) - - ;; NOMNL: (import "env" "array_set_val_i32" (func $array_set_val_i32 (param i32 i32) (result i32))) - - ;; NOMNL: (import "env" "array_set_val_i64" (func $array_set_val_i64 (param i32 i64) (result i64))) - - ;; NOMNL: (import "env" "array_set_val_f32" (func $array_set_val_f32 (param i32 f32) (result f32))) - - ;; NOMNL: (import "env" "array_set_val_f64" (func $array_set_val_f64 (param i32 f64) (result f64))) - - ;; NOMNL: (import "env" "array_get_index" (func $array_get_index (param i32 i32) (result i32))) - - ;; NOMNL: (import "env" "array_set_index" (func $array_set_index (param i32 i32) (result i32))) - - ;; NOMNL: (func $structs (type $ref|$struct|_=>_none) (param $x (ref $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $struct_get_val_i32 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: (struct.get $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $struct_get_val_f32 - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (struct.get $struct 1 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $struct_get_val_f64 - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: (struct.get $struct $named - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.set $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (call $struct_set_val_i32 - ;; NOMNL-NEXT: (i32.const 3) - ;; NOMNL-NEXT: (i32.const 42) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $structs (param $x (ref $struct)) (drop (struct.get $struct 0 (local.get $x)) @@ -259,31 +153,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $arrays (type $ref|$array|_=>_none) (param $x (ref $array)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $array_get_val_f64 - ;; NOMNL-NEXT: (i32.const 5) - ;; NOMNL-NEXT: (array.get $array - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (call $array_get_index - ;; NOMNL-NEXT: (i32.const 4) - ;; NOMNL-NEXT: (i32.const 10) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (array.set $array - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (call $array_set_index - ;; NOMNL-NEXT: (i32.const 6) - ;; NOMNL-NEXT: (i32.const 42) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $array_set_val_f64 - ;; NOMNL-NEXT: (i32.const 7) - ;; NOMNL-NEXT: (f64.const 3.14159) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $arrays (param $x (ref $array)) (drop (array.get $array (local.get $x) (i32.const 10)) diff --git a/test/lit/passes/local-subtyping-nn.wast b/test/lit/passes/local-subtyping-nn.wast index 2eee625e7..c81e2bb6c 100644 --- a/test/lit/passes/local-subtyping-nn.wast +++ b/test/lit/passes/local-subtyping-nn.wast @@ -1,14 +1,11 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. ;; RUN: wasm-opt %s --local-subtyping -all --enable-gc-nn-locals -S -o - \ ;; RUN: | filecheck %s -;; RUN: wasm-opt %s --local-subtyping -all --enable-gc-nn-locals --nominal -S -o - \ -;; RUN: | filecheck %s --check-prefix=NOMNL (module (type $struct (struct)) ;; CHECK: (import "out" "i32" (func $i32 (result i32))) - ;; NOMNL: (import "out" "i32" (func $i32 (result i32))) (import "out" "i32" (func $i32 (result i32))) ;; CHECK: (func $non-nullable (type $none_=>_none) @@ -26,21 +23,6 @@ ;; CHECK-NEXT: (local.get $x) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-nullable (type $none_=>_none) - ;; NOMNL-NEXT: (local $x (ref none)) - ;; NOMNL-NEXT: (local $y (ref $none_=>_i32)) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $y - ;; NOMNL-NEXT: (ref.func $i32) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $non-nullable (local $x (ref null $struct)) (local $y funcref) @@ -73,20 +55,6 @@ ;; CHECK-NEXT: (local.get $x) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $uses-default (type $i32_=>_none) (param $i i32) - ;; NOMNL-NEXT: (local $x nullref) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (local.get $i) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $uses-default (param $i i32) (local $x (ref null any)) (if diff --git a/test/lit/passes/merge-similar-functions_types.wast b/test/lit/passes/merge-similar-functions_types.wast index 3fa71fa98..b146df8ba 100644 --- a/test/lit/passes/merge-similar-functions_types.wast +++ b/test/lit/passes/merge-similar-functions_types.wast @@ -1,19 +1,14 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. ;; RUN: foreach %s %t wasm-opt --merge-similar-functions -all -S -o - \ ;; RUN: | filecheck %s -;; RUN: foreach %s %t wasm-opt --merge-similar-functions -all --nominal -S -o - \ -;; RUN: | filecheck %s --check-prefix=NOMNL ;; Calls to functions $2 and $3 are the only differences between the contents ;; of $0 and $1, so we want to merge them and pass ref.funcs of $2 and $3. ;; However, their nominal types differ, so in nominal typing we cannot do so. (module ;; CHECK: (type $type$0 (func)) - ;; NOMNL: (type $type$0 (func)) (type $type$0 (func_subtype func)) - ;; NOMNL: (type $type$1 (func)) (type $type$1 (func_subtype func)) - ;; NOMNL: (type $type$2 (func)) (type $type$2 (func_subtype func)) (type $type$3 (func_subtype (param f32) (result f32) func)) (type $type$4 (func_subtype (param f64) (result f64) func)) @@ -26,25 +21,6 @@ ;; CHECK-NEXT: (ref.func $2) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $0 (type $type$0) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (call $2) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $0 (type $type$0) (nop) (nop) @@ -69,25 +45,6 @@ ;; CHECK-NEXT: (ref.func $3) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $1 (type $type$0) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (call $3) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $1 (type $type$0) (nop) (nop) @@ -112,11 +69,6 @@ ;; CHECK-NEXT: (i32.const 17) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $2 (type $type$1) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 17) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $2 (type $type$1) (drop (i32.const 17) @@ -127,11 +79,6 @@ ;; CHECK-NEXT: (i32.const 999) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $3 (type $type$2) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 999) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $3 (type $type$2) (drop (i32.const 999) @@ -139,9 +86,6 @@ ) ) - - - ;; CHECK: (func $byn$mgfn-shared$0 (type $ref|$type$0|_=>_none) (param $0 (ref $type$0)) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: (nop) @@ -166,25 +110,19 @@ (module ;; As above, but now the nominal types do match, so we can optimize in all ;; modes. - ;; CHECK: (type $type$0 (func)) - ;; NOMNL: (type $type$1 (func)) - - ;; NOMNL: (type $type$0 (func)) (type $type$0 (func_subtype func)) (type $type$1 (func_subtype func)) (type $type$3 (func_subtype (param f32) (result f32) func)) (type $type$4 (func_subtype (param f64) (result f64) func)) + ;; CHECK: (type $ref|$type$0|_=>_none (func (param (ref $type$0)))) ;; CHECK: (global $global$0 (mut i32) (i32.const 10)) - ;; NOMNL: (type $ref|$type$1|_=>_none (func (param (ref $type$1)))) - - ;; NOMNL: (global $global$0 (mut i32) (i32.const 10)) (global $global$0 (mut i32) (i32.const 10)) ;; CHECK: (memory $0 (shared 16 17)) - ;; NOMNL: (memory $0 (shared 16 17)) (memory $0 (shared 16 17)) + ;; CHECK: (elem declare func $2 $3) ;; CHECK: (func $0 (type $type$0) @@ -192,13 +130,6 @@ ;; CHECK-NEXT: (ref.func $2) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (elem declare func $2 $3) - - ;; NOMNL: (func $0 (type $type$0) - ;; NOMNL-NEXT: (call $byn$mgfn-shared$0 - ;; NOMNL-NEXT: (ref.func $2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $0 (type $type$0) (nop) (nop) @@ -223,11 +154,6 @@ ;; CHECK-NEXT: (ref.func $3) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $1 (type $type$0) - ;; NOMNL-NEXT: (call $byn$mgfn-shared$0 - ;; NOMNL-NEXT: (ref.func $3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $1 (type $type$0) (nop) (nop) @@ -252,11 +178,6 @@ ;; CHECK-NEXT: (i32.const 17) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $2 (type $type$1) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 17) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $2 (type $type$1) (drop (i32.const 17) @@ -267,11 +188,6 @@ ;; CHECK-NEXT: (i32.const 999) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $3 (type $type$1) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 999) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $3 (type $type$1) (drop (i32.const 999) @@ -299,25 +215,3 @@ ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - -;; NOMNL: (func $byn$mgfn-shared$0 (type $ref|$type$1|_=>_none) (param $0 (ref $type$1)) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (call_ref $type$1 -;; NOMNL-NEXT: (local.get $0) -;; NOMNL-NEXT: ) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: (nop) -;; NOMNL-NEXT: ) diff --git a/test/lit/passes/name-types.wast b/test/lit/passes/name-types.wast index 8f11e9efd..61dbb3079 100644 --- a/test/lit/passes/name-types.wast +++ b/test/lit/passes/name-types.wast @@ -1,6 +1,5 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. ;; RUN: wasm-opt %s -all --name-types -S -o - | filecheck %s -;; RUN: wasm-opt %s -all --name-types --nominal -S -o - | filecheck %s --check-prefix=NOMNL (module ;; An obnoxious name that will be renamed. @@ -10,11 +9,6 @@ ;; CHECK: (type $type$1 (struct )) ;; CHECK: (type $reasonable-name (struct (field i32))) - ;; NOMNL: (type $type$0 (func (param (ref $type$1) (ref $reasonable-name)))) - - ;; NOMNL: (type $type$1 (struct )) - - ;; NOMNL: (type $reasonable-name (struct (field i32))) (type $reasonable-name (struct (field i32))) ;; CHECK: (type $type$0 (func (param (ref $type$1) (ref $reasonable-name)))) @@ -22,9 +16,6 @@ ;; CHECK: (func $foo (type $type$0) (param $x (ref $type$1)) (param $y (ref $reasonable-name)) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $foo (type $type$0) (param $x (ref $type$1)) (param $y (ref $reasonable-name)) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $foo ;; Use the types to keep them alive. (param $x (ref $obnoxious-super-long-type-name_____________________________1)) diff --git a/test/lit/passes/optimize-instructions-gc-iit.wast b/test/lit/passes/optimize-instructions-gc-iit.wast index 3a098c0b4..0e315dd5d 100644 --- a/test/lit/passes/optimize-instructions-gc-iit.wast +++ b/test/lit/passes/optimize-instructions-gc-iit.wast @@ -1,38 +1,31 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. + ;; RUN: foreach %s %t wasm-opt --optimize-instructions --ignore-implicit-traps --enable-reference-types --enable-gc -S -o - \ ;; RUN: | filecheck %s -;; RUN: foreach %s %t wasm-opt --optimize-instructions --ignore-implicit-traps --enable-reference-types --enable-gc --nominal -S -o - \ -;; RUN: | filecheck %s --check-prefix NOMNL -;; Also test trapsNeverHappen (with nominal; no need for both type system modes). -;; RUN: foreach %s %t wasm-opt --optimize-instructions --traps-never-happen --enable-reference-types --enable-gc --nominal -S -o - \ -;; RUN: | filecheck %s --check-prefix NOMNL-TNH + +;; Also test trapsNeverHappen +;; RUN: foreach %s %t wasm-opt --optimize-instructions --traps-never-happen --enable-reference-types --enable-gc -S -o - \ +;; RUN: | filecheck %s --check-prefix TNH (module ;; CHECK: (type $parent (struct (field i32))) - ;; NOMNL: (type $parent (struct (field i32))) - ;; NOMNL-TNH: (type $parent (struct (field i32))) + ;; TNH: (type $parent (struct (field i32))) (type $parent (struct (field i32))) ;; CHECK: (type $child (struct_subtype (field i32) (field f64) $parent)) - ;; NOMNL: (type $child (struct_subtype (field i32) (field f64) $parent)) - ;; NOMNL-TNH: (type $child (struct_subtype (field i32) (field f64) $parent)) + ;; TNH: (type $child (struct_subtype (field i32) (field f64) $parent)) (type $child (struct_subtype (field i32) (field f64) $parent)) ;; CHECK: (type $other (struct (field i64) (field f32))) - ;; NOMNL: (type $other (struct (field i64) (field f32))) - ;; NOMNL-TNH: (type $other (struct (field i64) (field f32))) + ;; TNH: (type $other (struct (field i64) (field f32))) (type $other (struct (field i64) (field f32))) ;; CHECK: (func $foo (type $none_=>_none) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $foo (type $none_=>_none) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) - ;; NOMNL-TNH: (func $foo (type $none_=>_none) - ;; NOMNL-TNH-NEXT: (nop) - ;; NOMNL-TNH-NEXT: ) + ;; TNH: (func $foo (type $none_=>_none) + ;; TNH-NEXT: (nop) + ;; TNH-NEXT: ) (func $foo) - ;; CHECK: (func $ref-cast-iit (type $ref|$parent|_ref|$child|_ref|$other|_=>_none) (param $parent (ref $parent)) (param $child (ref $child)) (param $other (ref $other)) ;; CHECK-NEXT: (drop ;; CHECK-NEXT: (local.get $parent) @@ -54,48 +47,27 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-iit (type $ref|$parent|_ref|$child|_ref|$other|_=>_none) (param $parent (ref $parent)) (param $child (ref $child)) (param $other (ref $other)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $parent) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $child) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $child - ;; NOMNL-NEXT: (local.get $parent) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $child) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-TNH: (func $ref-cast-iit (type $ref|$parent|_ref|$child|_ref|$other|_=>_none) (param $parent (ref $parent)) (param $child (ref $child)) (param $other (ref $other)) - ;; NOMNL-TNH-NEXT: (drop - ;; NOMNL-TNH-NEXT: (local.get $parent) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: (drop - ;; NOMNL-TNH-NEXT: (local.get $child) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: (drop - ;; NOMNL-TNH-NEXT: (ref.cast $child - ;; NOMNL-TNH-NEXT: (local.get $parent) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: (drop - ;; NOMNL-TNH-NEXT: (block - ;; NOMNL-TNH-NEXT: (drop - ;; NOMNL-TNH-NEXT: (local.get $child) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: (unreachable) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: ) + ;; TNH: (func $ref-cast-iit (type $ref|$parent|_ref|$child|_ref|$other|_=>_none) (param $parent (ref $parent)) (param $child (ref $child)) (param $other (ref $other)) + ;; TNH-NEXT: (drop + ;; TNH-NEXT: (local.get $parent) + ;; TNH-NEXT: ) + ;; TNH-NEXT: (drop + ;; TNH-NEXT: (local.get $child) + ;; TNH-NEXT: ) + ;; TNH-NEXT: (drop + ;; TNH-NEXT: (ref.cast $child + ;; TNH-NEXT: (local.get $parent) + ;; TNH-NEXT: ) + ;; TNH-NEXT: ) + ;; TNH-NEXT: (drop + ;; TNH-NEXT: (block + ;; TNH-NEXT: (drop + ;; TNH-NEXT: (local.get $child) + ;; TNH-NEXT: ) + ;; TNH-NEXT: (unreachable) + ;; TNH-NEXT: ) + ;; TNH-NEXT: ) + ;; TNH-NEXT: ) (func $ref-cast-iit (param $parent (ref $parent)) (param $child (ref $child)) @@ -146,38 +118,22 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-iit-bad (type $ref|$parent|_=>_none) (param $parent (ref $parent)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $parent)) - ;; NOMNL-NEXT: (call $foo) - ;; NOMNL-NEXT: (local.get $parent) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-TNH: (func $ref-cast-iit-bad (type $ref|$parent|_=>_none) (param $parent (ref $parent)) - ;; NOMNL-TNH-NEXT: (drop - ;; NOMNL-TNH-NEXT: (block (result (ref $parent)) - ;; NOMNL-TNH-NEXT: (call $foo) - ;; NOMNL-TNH-NEXT: (local.get $parent) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: (drop - ;; NOMNL-TNH-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-TNH-NEXT: (drop - ;; NOMNL-TNH-NEXT: (unreachable) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: (unreachable) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: ) + ;; TNH: (func $ref-cast-iit-bad (type $ref|$parent|_=>_none) (param $parent (ref $parent)) + ;; TNH-NEXT: (drop + ;; TNH-NEXT: (block (result (ref $parent)) + ;; TNH-NEXT: (call $foo) + ;; TNH-NEXT: (local.get $parent) + ;; TNH-NEXT: ) + ;; TNH-NEXT: ) + ;; TNH-NEXT: (drop + ;; TNH-NEXT: (block ;; (replaces something unreachable we can't emit) + ;; TNH-NEXT: (drop + ;; TNH-NEXT: (unreachable) + ;; TNH-NEXT: ) + ;; TNH-NEXT: (unreachable) + ;; TNH-NEXT: ) + ;; TNH-NEXT: ) + ;; TNH-NEXT: ) (func $ref-cast-iit-bad (param $parent (ref $parent)) @@ -204,16 +160,11 @@ ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-eq-ref-cast (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-TNH: (func $ref-eq-ref-cast (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-TNH-NEXT: (drop - ;; NOMNL-TNH-NEXT: (i32.const 1) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: ) + ;; TNH: (func $ref-eq-ref-cast (type $eqref_=>_none) (param $x eqref) + ;; TNH-NEXT: (drop + ;; TNH-NEXT: (i32.const 1) + ;; TNH-NEXT: ) + ;; TNH-NEXT: ) (func $ref-eq-ref-cast (param $x eqref) ;; we can look through a ref.cast null if we ignore traps (drop @@ -231,16 +182,11 @@ ;; CHECK-NEXT: (local.get $x) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $set-of-as-non-null (type $anyref_=>_none) (param $x anyref) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-TNH: (func $set-of-as-non-null (type $anyref_=>_none) (param $x anyref) - ;; NOMNL-TNH-NEXT: (local.set $x - ;; NOMNL-TNH-NEXT: (local.get $x) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: ) + ;; TNH: (func $set-of-as-non-null (type $anyref_=>_none) (param $x anyref) + ;; TNH-NEXT: (local.set $x + ;; TNH-NEXT: (local.get $x) + ;; TNH-NEXT: ) + ;; TNH-NEXT: ) (func $set-of-as-non-null (param $x anyref) ;; As we ignore such traps, we can remove the ref.as here. (local.set $x @@ -255,20 +201,17 @@ (rec ;; CHECK: (rec ;; CHECK-NEXT: (type $A (struct )) - ;; NOMNL: (type $A (struct )) - ;; NOMNL-TNH: (type $A (struct )) + ;; TNH: (rec + ;; TNH-NEXT: (type $A (struct )) (type $A (struct_subtype data)) ;; CHECK: (type $B (struct_subtype (field (ref null $A)) $A)) - ;; NOMNL: (type $B (struct_subtype (field (ref null $A)) $A)) - ;; NOMNL-TNH: (type $B (struct_subtype (field (ref null $A)) $A)) + ;; TNH: (type $B (struct_subtype (field (ref null $A)) $A)) (type $B (struct_subtype (field (ref null $A)) $A)) ;; CHECK: (type $C (struct_subtype (field (ref null $D)) $B)) - ;; NOMNL: (type $C (struct_subtype (field (ref null $D)) $B)) - ;; NOMNL-TNH: (type $C (struct_subtype (field (ref null $D)) $B)) + ;; TNH: (type $C (struct_subtype (field (ref null $D)) $B)) (type $C (struct_subtype (field (ref null $D)) $B)) ;; CHECK: (type $D (struct_subtype $A)) - ;; NOMNL: (type $D (struct_subtype $A)) - ;; NOMNL-TNH: (type $D (struct_subtype $A)) + ;; TNH: (type $D (struct_subtype $A)) (type $D (struct_subtype $A)) ) @@ -277,16 +220,11 @@ ;; CHECK-NEXT: (local.get $C) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $test (type $ref|$C|_=>_anyref) (param $C (ref $C)) (result anyref) - ;; NOMNL-NEXT: (struct.get $C 0 - ;; NOMNL-NEXT: (local.get $C) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-TNH: (func $test (type $ref|$C|_=>_anyref) (param $C (ref $C)) (result anyref) - ;; NOMNL-TNH-NEXT: (struct.get $C 0 - ;; NOMNL-TNH-NEXT: (local.get $C) - ;; NOMNL-TNH-NEXT: ) - ;; NOMNL-TNH-NEXT: ) + ;; TNH: (func $test (type $ref|$C|_=>_anyref) (param $C (ref $C)) (result anyref) + ;; TNH-NEXT: (struct.get $C 0 + ;; TNH-NEXT: (local.get $C) + ;; TNH-NEXT: ) + ;; TNH-NEXT: ) (func $test (param $C (ref $C)) (result anyref) (struct.get $B 0 (ref.cast $B ;; Try to cast a $C to its parent, $B. That always diff --git a/test/lit/passes/optimize-instructions-gc.wast b/test/lit/passes/optimize-instructions-gc.wast index 0f35cc238..e6c251ad2 100644 --- a/test/lit/passes/optimize-instructions-gc.wast +++ b/test/lit/passes/optimize-instructions-gc.wast @@ -1,12 +1,10 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. + ;; RUN: wasm-opt %s --remove-unused-names --optimize-instructions --enable-reference-types --enable-gc -S -o - \ ;; RUN: | filecheck %s -;; RUN: wasm-opt %s --remove-unused-names --optimize-instructions --enable-reference-types --enable-gc --nominal -S -o - \ -;; RUN: | filecheck %s --check-prefix NOMNL (module ;; CHECK: (type $struct (struct (field $i8 (mut i8)) (field $i16 (mut i16)) (field $i32 (mut i32)) (field $i64 (mut i64)))) - ;; NOMNL: (type $struct (struct (field $i8 (mut i8)) (field $i16 (mut i16)) (field $i32 (mut i32)) (field $i64 (mut i64)))) (type $struct (struct (field $i8 (mut i8)) (field $i16 (mut i16)) @@ -15,15 +13,11 @@ )) ;; CHECK: (type $A (struct (field i32))) - ;; NOMNL: (type $A (struct (field i32))) (type $A (struct (field i32))) ;; CHECK: (type $B (struct_subtype (field i32) (field i32) (field f32) $A)) ;; CHECK: (type $array (array (mut i8))) - ;; NOMNL: (type $B (struct_subtype (field i32) (field i32) (field f32) $A)) - - ;; NOMNL: (type $array (array (mut i8))) (type $array (array (mut i8))) (type $B (struct_subtype (field i32) (field i32) (field f32) $A)) @@ -31,9 +25,6 @@ ;; CHECK: (type $void (func)) ;; CHECK: (type $B-child (struct_subtype (field i32) (field i32) (field f32) (field i64) $B)) - ;; NOMNL: (type $void (func)) - - ;; NOMNL: (type $B-child (struct_subtype (field i32) (field i32) (field f32) (field i64) $B)) (type $B-child (struct_subtype (field i32) (field i32) (field f32) (field i64) $B)) (type $empty (struct)) @@ -41,9 +32,6 @@ ;; CHECK: (type $void2 (func_subtype $void)) ;; CHECK: (type $C (struct_subtype (field i32) (field i32) (field f64) $A)) - ;; NOMNL: (type $void2 (func_subtype $void)) - - ;; NOMNL: (type $C (struct_subtype (field i32) (field i32) (field f64) $A)) (type $C (struct_subtype (field i32) (field i32) (field f64) $A)) (type $void (func)) @@ -51,7 +39,6 @@ (type $void2 (func_subtype $void)) ;; CHECK: (import "env" "get-i32" (func $get-i32 (result i32))) - ;; NOMNL: (import "env" "get-i32" (func $get-i32 (result i32))) (import "env" "get-i32" (func $get-i32 (result i32))) ;; These functions test if an `if` with subtyped arms is correctly folded @@ -59,9 +46,6 @@ ;; CHECK: (func $if-arms-subtype-fold (type $none_=>_anyref) (result anyref) ;; CHECK-NEXT: (ref.null none) ;; CHECK-NEXT: ) - ;; NOMNL: (func $if-arms-subtype-fold (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) (func $if-arms-subtype-fold (result anyref) (if (result anyref) (i32.const 0) @@ -77,13 +61,6 @@ ;; CHECK-NEXT: (local.get $i31ref) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $if-arms-subtype-nofold (type $i31ref_=>_anyref) (param $i31ref i31ref) (result anyref) - ;; NOMNL-NEXT: (if (result anyref) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: (local.get $i31ref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $if-arms-subtype-nofold (param $i31ref i31ref) (result anyref) (if (result anyref) (i32.const 0) @@ -107,20 +84,6 @@ ;; CHECK-NEXT: (call $get-i32) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $store-trunc (type $ref?|$struct|_=>_none) (param $x (ref null $struct)) - ;; NOMNL-NEXT: (struct.set $struct $i8 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (i32.const 35) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.set $struct $i16 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (i32.const 9029) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.set $struct $i8 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (call $get-i32) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $store-trunc (param $x (ref null $struct)) (struct.set $struct $i8 (local.get $x) @@ -147,13 +110,6 @@ ;; CHECK-NEXT: (i32.const 35) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $store-trunc2 (type $ref?|$array|_=>_none) (param $x (ref null $array)) - ;; NOMNL-NEXT: (array.set $array - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: (i32.const 35) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $store-trunc2 (param $x (ref null $array)) (array.set $array (local.get $x) @@ -190,32 +146,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $unneeded_is (type $ref|$struct|_ref|func|_ref|i31|_=>_none) (param $struct (ref $struct)) (param $func (ref func)) (param $i31 (ref i31)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $func) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $unneeded_is (param $struct (ref $struct)) (param $func (ref func)) @@ -254,27 +184,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $unneeded_is_null (type $ref?|$struct|_funcref_i31ref_=>_none) (param $struct (ref null $struct)) (param $func funcref) (param $i31 i31ref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.eqz - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $func) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.eqz - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $unneeded_is_null (param $struct (ref null $struct)) (param $func (ref null func)) @@ -306,17 +215,6 @@ ;; CHECK-NEXT: (local.get $i31) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $unneeded_as (type $ref|$struct|_ref|func|_ref|i31|_=>_none) (param $struct (ref $struct)) (param $func (ref func)) (param $i31 (ref i31)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $func) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $unneeded_as (param $struct (ref $struct)) (param $func (ref func)) @@ -351,23 +249,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $unneeded_as_null (type $ref?|$struct|_funcref_i31ref_=>_none) (param $struct (ref null $struct)) (param $func funcref) (param $i31 i31ref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $func) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $i31) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $unneeded_as_null (param $struct (ref null $struct)) (param $func (ref null func)) @@ -398,21 +279,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $unneeded_unreachability (type $void) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.is_func - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $unneeded_unreachability ;; unreachable instructions can simply be ignored (drop @@ -458,41 +324,6 @@ ;; CHECK-NEXT: (local.get $f) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $redundant-non-null-casts (type $ref?|$struct|_ref?|$array|_ref?|$void|_=>_none) (param $x (ref null $struct)) (param $y (ref null $array)) (param $f (ref null $void)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.set $struct $i8 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.get_u $struct $i8 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (array.set $array - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: (i32.const 3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.get_u $array - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: (i32.const 4) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.len - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call_ref $void - ;; NOMNL-NEXT: (local.get $f) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $redundant-non-null-casts (param $x (ref null $struct)) (param $y (ref null $array)) (param $f (ref null $void)) (drop (ref.as_non_null @@ -548,9 +379,6 @@ ;; CHECK: (func $get-eqref (type $none_=>_eqref) (result eqref) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $get-eqref (type $none_=>_eqref) (result eqref) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $get-eqref (result eqref) (unreachable) ) @@ -577,28 +405,6 @@ ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-eq (type $eqref_eqref_=>_none) (param $x eqref) (param $y eqref) - ;; NOMNL-NEXT: (local $lx eqref) - ;; NOMNL-NEXT: (local $ly eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $lx - ;; NOMNL-NEXT: (call $get-eqref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-eq (param $x eqref) (param $y eqref) (local $lx eqref) (local $ly eqref) @@ -649,12 +455,8 @@ ;; CHECK: (func $nothing (type $void) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $nothing (type $void) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $nothing) - ;; CHECK: (func $ref-eq-corner-cases (type $eqref_=>_none) (param $x eqref) ;; CHECK-NEXT: (drop ;; CHECK-NEXT: (ref.eq @@ -688,39 +490,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-eq-corner-cases (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (block (result eqref) - ;; NOMNL-NEXT: (call $nothing) - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (block (result eqref) - ;; NOMNL-NEXT: (call $nothing) - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (struct.new_default $struct) - ;; NOMNL-NEXT: (struct.new_default $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.tee $x - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-eq-corner-cases (param $x eqref) ;; side effects prevent optimization (drop @@ -785,16 +554,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-eq-ref-cast (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (ref.cast null $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-eq-ref-cast (param $x eqref) ;; it is almost valid to look through a cast, except that it might trap so ;; there is a side effect @@ -832,30 +591,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $flip-cast-of-as-non-null (type $anyref_=>_none) (param $x anyref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.get_u $struct $i8 - ;; NOMNL-NEXT: (ref.cast $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_i31 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $flip-cast-of-as-non-null (param $x anyref) (drop (ref.cast $struct @@ -894,15 +629,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $flip-tee-of-as-non-null (type $anyref_=>_none) (param $x anyref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.tee $x - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $flip-tee-of-as-non-null (param $x anyref) (drop (local.tee $x @@ -923,15 +649,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $flip-tee-of-as-non-null-non-nullable (type $ref|any|_anyref_=>_none) (param $x (ref any)) (param $y anyref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.tee $x - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $flip-tee-of-as-non-null-non-nullable (param $x (ref any)) (param $y (ref null any)) (drop (local.tee $x @@ -955,17 +672,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ternary-identical-arms (type $i32_ref?|$struct|_ref?|$struct|_=>_none) (param $x i32) (param $y (ref null $struct)) (param $z (ref null $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (if (result (ref null $struct)) - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: (local.get $z) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ternary-identical-arms (param $x i32) (param $y (ref null $struct)) (param $z (ref null $struct)) (drop (if (result i32) @@ -988,19 +694,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $select-identical-arms-but-side-effect (type $ref?|$struct|_ref?|$struct|_i32_=>_none) (param $x (ref null $struct)) (param $y (ref null $struct)) (param $z i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (select - ;; NOMNL-NEXT: (struct.get_u $struct $i8 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get_u $struct $i8 - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $z) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $select-identical-arms-but-side-effect (param $x (ref null $struct)) (param $y (ref null $struct)) (param $z i32) (drop (select @@ -1026,17 +719,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ternary-identical-arms-no-side-effect (type $ref|$struct|_ref|$struct|_i32_=>_none) (param $x (ref $struct)) (param $y (ref $struct)) (param $z i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.get_u $struct $i8 - ;; NOMNL-NEXT: (select (result (ref $struct)) - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: (local.get $z) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ternary-identical-arms-no-side-effect (param $x (ref $struct)) (param $y (ref $struct)) (param $z i32) (drop (select @@ -1062,17 +744,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $if-identical-arms-with-side-effect (type $ref?|$struct|_ref?|$struct|_i32_=>_none) (param $x (ref null $struct)) (param $y (ref null $struct)) (param $z i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.get_u $struct $i8 - ;; NOMNL-NEXT: (if (result (ref null $struct)) - ;; NOMNL-NEXT: (local.get $z) - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $if-identical-arms-with-side-effect (param $x (ref null $struct)) (param $y (ref null $struct)) (param $z i32) (drop (if (result i32) @@ -1096,13 +767,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-squared (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-squared (param $x eqref) ;; Identical ref.casts can be folded together. (drop @@ -1130,23 +794,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-squared-fallthrough (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (local $1 (ref null $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref null $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.tee $x - ;; NOMNL-NEXT: (local.tee $1 - ;; NOMNL-NEXT: (ref.cast null $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-squared-fallthrough (param $x eqref) ;; A fallthrough in the middle does not prevent this optimization. (drop @@ -1166,13 +813,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-cubed (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-cubed (param $x eqref) ;; Three and more also work. (drop @@ -1192,13 +832,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-squared-different (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null none - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-squared-different (param $x eqref) ;; Different casts cannot be folded. We can emit a cast to null here, which ;; is the only possible thing that can pass through. @@ -1226,21 +859,6 @@ ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-eq-null (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-eq-null (param $x eqref) ;; Equality to null can be done with ref.is_null. (drop @@ -1279,18 +897,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-eq-possible (type $eqref_eqref_=>_none) (param $x eqref) (param $y eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (ref.cast null $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.cast null $array - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-eq-possible (param $x eqref) (param $y eqref) ;; These casts are to types that are incompatible. However, it is possible ;; they are both null, so we cannot optimize here. @@ -1353,53 +959,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-eq-impossible (type $eqref_eqref_=>_none) (param $x eqref) (param $y eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $array - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $array - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $array - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-eq-impossible (param $x eqref) (param $y eqref) ;; As above but cast one of them to non-null, which proves they cannot be ;; equal, and the result must be 0. @@ -1467,28 +1026,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-eq-possible-b (type $eqref_eqref_=>_none) (param $x eqref) (param $y eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (ref.cast $A - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.cast $B - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (ref.cast $B - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.cast $A - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-eq-possible-b (param $x eqref) (param $y eqref) ;; As above but the casts are to things that are compatible, since B is a ;; subtype of A, so we cannot optimize. @@ -1526,17 +1063,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $hoist-LUB-danger (type $i32_ref|$B|_ref|$C|_=>_i32) (param $x i32) (param $b (ref $B)) (param $c (ref $C)) (result i32) - ;; NOMNL-NEXT: (if (result i32) - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (struct.get $B 1 - ;; NOMNL-NEXT: (local.get $b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $C 1 - ;; NOMNL-NEXT: (local.get $c) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $hoist-LUB-danger (param $x i32) (param $b (ref $B)) (param $c (ref $C)) (result i32) ;; In nominal typing, if we hoist the struct.get out of the if, then the if ;; will have a new type, $A, but $A does not have field "1" which would be an @@ -1567,16 +1093,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $incompatible-cast-of-non-null (type $ref|$struct|_=>_none) (param $struct (ref $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $array)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $incompatible-cast-of-non-null (param $struct (ref $struct)) (drop (ref.cast $array @@ -1600,21 +1116,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $incompatible-cast-of-null (type $ref?|$struct|_=>_none) (param $x (ref null $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $incompatible-cast-of-null (param $x (ref null $struct)) (drop (ref.cast $array @@ -1642,13 +1143,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $incompatible-cast-of-unknown (type $ref?|$struct|_=>_none) (param $struct (ref null $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null none - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $incompatible-cast-of-unknown (param $struct (ref null $struct)) (drop (ref.cast null $array @@ -1682,31 +1176,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $incompatible-test (type $ref?|$struct|_=>_none) (param $struct (ref null $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $struct) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $incompatible-test (param $struct (ref null $struct)) (drop ;; This test will definitely fail, so we can turn it into 0. @@ -1774,48 +1243,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $subtype-compatible (type $ref?|$A|_ref?|$B|_=>_none) (param $A (ref null $A)) (param $B (ref null $B)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.test $B - ;; NOMNL-NEXT: (local.get $A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.eqz - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $B) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $B) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $B) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $B) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $subtype-compatible (param $A (ref null $A)) (param $B (ref null $B)) (drop ;; B is a subtype of A, so this can work. @@ -1865,18 +1292,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref.test-unreachable (type $ref?|$A|_=>_none) (param $A (ref null $A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.test $A - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.test null $A - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref.test-unreachable (param $A (ref null $A)) (drop ;; We should ignore unreachable ref.tests and not try to compare their @@ -1942,56 +1357,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-static-null (type $void) - ;; NOMNL-NEXT: (local $a (ref null $A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.tee $a - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.tee $a - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (ref.cast null none - ;; NOMNL-NEXT: (local.get $a) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result nullref) - ;; NOMNL-NEXT: (ref.cast null none - ;; NOMNL-NEXT: (local.get $a) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-static-null (local $a (ref null $A)) ;; Casting nulls results in a null. @@ -2056,24 +1421,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-static-general (type $ref?|$A|_ref?|$B|_=>_none) (param $a (ref null $A)) (param $b (ref null $B)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $a) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B - ;; NOMNL-NEXT: (local.get $a) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.tee $a - ;; NOMNL-NEXT: (local.get $a) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-static-general (param $a (ref null $A)) (param $b (ref null $B)) ;; In the general case, a static cast of something simply succeeds if the ;; type is a subtype. @@ -2120,23 +1467,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-static-squared (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $A - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-static-squared (param $x eqref) ;; Identical ref.casts can be folded together. (drop @@ -2195,38 +1525,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-static-many (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B-child - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B-child - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B-child - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B-child - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B-child - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B-child - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-static-many (param $x eqref) ;; We should optimize a long sequence of static casts when we can. All six ;; orderings of these casts should collapse into the strictest one. @@ -2293,13 +1591,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-static-very-many (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B-child - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-static-very-many (param $x eqref) ;; We should optimize an arbitrarily-long long sequence of static casts. (drop @@ -2343,18 +1634,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-static-fallthrough-remaining (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref null $B)) - ;; NOMNL-NEXT: (call $ref-cast-static-fallthrough-remaining - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.cast null $B - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-static-fallthrough-remaining (param $x eqref) (drop (ref.cast null $A @@ -2392,20 +1671,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-static-fallthrough-remaining-child (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null $B - ;; NOMNL-NEXT: (block (result eqref) - ;; NOMNL-NEXT: (call $ref-cast-static-fallthrough-remaining-child - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.cast null $A - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-static-fallthrough-remaining-child (param $x eqref) (drop ;; As above, but with $A and $B flipped. Now the inner cast is not needed. @@ -2441,23 +1706,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-static-fallthrough-remaining-impossible (type $ref|eq|_=>_none) (param $x (ref eq)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $array)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref eq)) - ;; NOMNL-NEXT: (call $ref-cast-static-fallthrough-remaining-impossible - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.cast $struct - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-static-fallthrough-remaining-impossible (param $x (ref eq)) (drop ;; As above, but with an impossible cast of an array to a struct. The @@ -2496,26 +1744,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-static-fallthrough-remaining-nonnull (type $ref|eq|_=>_none) (param $x (ref eq)) - ;; NOMNL-NEXT: (local $1 (ref $B)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $B)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $B)) - ;; NOMNL-NEXT: (call $ref-cast-static-fallthrough-remaining - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.tee $1 - ;; NOMNL-NEXT: (ref.cast $B - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-static-fallthrough-remaining-nonnull (param $x (ref eq)) ;; The input is non-nullable here, and the middle block is of a simpler type ;; than either the parent or the child. This checks that we do not @@ -2572,43 +1800,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-static-squared-impossible (type $eqref_=>_none) (param $x eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null none - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $array - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $array - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $array - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-static-squared-impossible (param $x eqref) ;; Impossible casts will trap unless the input is null. Only the first one ;; here, which lets a null get through, will not trap. @@ -2659,23 +1850,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-test-static-same-type (type $ref?|$A|_ref|$A|_=>_none) (param $nullable (ref null $A)) (param $non-nullable (ref $A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.eqz - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $nullable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $non-nullable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-test-static-same-type (param $nullable (ref null $A)) (param $non-nullable (ref $A)) ;; A nullable value cannot be optimized here even though it is the same ;; type. But we can at least use !ref.is_null rather than ref.test. @@ -2709,23 +1883,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-test-static-subtype (type $ref?|$B|_ref|$B|_=>_none) (param $nullable (ref null $B)) (param $non-nullable (ref $B)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.eqz - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $nullable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $non-nullable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-test-static-subtype (param $nullable (ref null $B)) (param $non-nullable (ref $B)) ;; As above, but the input is a subtype, so the same things happen. (drop @@ -2752,18 +1909,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-test-static-supertype (type $ref?|$A|_ref|$A|_=>_none) (param $nullable (ref null $A)) (param $non-nullable (ref $A)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.test $B - ;; NOMNL-NEXT: (local.get $nullable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.test $B - ;; NOMNL-NEXT: (local.get $non-nullable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-test-static-supertype (param $nullable (ref null $A)) (param $non-nullable (ref $A)) ;; As above, but the input is a supertype. We can't know at compile time ;; what to do here. @@ -2797,24 +1942,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-test-static-impossible (type $ref?|$array|_ref|$array|_=>_none) (param $nullable (ref null $array)) (param $non-nullable (ref $array)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $nullable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $non-nullable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-test-static-impossible (param $nullable (ref null $array)) (param $non-nullable (ref $array)) ;; Testing an impossible cast will definitely fail. (drop @@ -2847,24 +1974,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-boolean (type $eqref_eqref_=>_none) (param $x eqref) (param $y eqref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.test $A - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-boolean (param $x eqref) (param $y eqref) ;; ref.eq returns a boolean, so &1 on it is not needed. (drop @@ -2898,9 +2007,6 @@ ;; CHECK: (func $impossible (type $none_=>_ref|none|) (result (ref none)) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $impossible (type $none_=>_ref|none|) (result (ref none)) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $impossible (result (ref none)) (unreachable) ) @@ -2921,22 +2027,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $bottom-type-accessors (type $ref|none|_nullref_=>_none) (param $bot (ref none)) (param $null nullref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $impossible) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $bottom-type-accessors (param $bot (ref none)) (param $null nullref) (drop (struct.get $A 0 @@ -2979,22 +2069,6 @@ ;; CHECK-NEXT: (local.get $null-b) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-heap-type (type $ref?|$B|_ref|$B|_=>_none) (param $null-b (ref null $B)) (param $b (ref $B)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $null-b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $null-b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-heap-type (param $null-b (ref null $B)) (param $b (ref $B)) ;; We are casting a heap type to a supertype, which always succeeds. However ;; we need to check for nullability. @@ -3057,37 +2131,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-cast-heap-type-incompatible (type $ref?|$B|_ref|$B|_=>_none) (param $null-b (ref null $B)) (param $b (ref $B)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $null-b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result (ref $struct)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast null none - ;; NOMNL-NEXT: (local.get $null-b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-cast-heap-type-incompatible (param $null-b (ref null $B)) (param $b (ref $B)) ;; As above, but replacing $A with $struct. Now we have two incompatible ;; types, $B and $struct, so the only possible way the cast succeeds is if @@ -3119,9 +2162,6 @@ ;; CHECK: (func $as_of_unreachable (type $none_=>_ref|$A|) (result (ref $A)) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $as_of_unreachable (type $none_=>_ref|$A|) (result (ref $A)) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $as_of_unreachable (result (ref $A)) ;; The cast will definitely fail, so we can turn it into an unreachable. The ;; ref.as must then ignore the unreachable input and not error on trying to @@ -3142,15 +2182,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $cast-internalized-extern (type $externref_=>_none) (param $externref externref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $A - ;; NOMNL-NEXT: (extern.internalize - ;; NOMNL-NEXT: (local.get $externref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $cast-internalized-extern (param $externref externref) ;; We cannot optimize this cast, and in particular we should not treat the ;; externref as falling through to the cast and incorrectly inferring that @@ -3178,20 +2209,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $struct.set.null.fallthrough (type $void) - ;; NOMNL-NEXT: (local $temp (ref null $struct)) - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.tee $temp - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 100) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $struct.set.null.fallthrough (local $temp (ref null $struct)) ;; The value falling through the tee shows the struct.set will trap. We can @@ -3224,23 +2241,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $set.array.null (type $void) - ;; NOMNL-NEXT: (local $temp (ref none)) - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.tee $temp - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (i32.const 3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $set.array.null (local $temp (ref none)) @@ -3267,13 +2267,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refinalize.select.arm (type $void) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $void2 - ;; NOMNL-NEXT: (ref.func $refinalize.select.arm) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $refinalize.select.arm (type $void) ;; Pick one of the two select sides using the condition. This changes the ;; type (the arms are more refined than the declared type), so we must @@ -3296,13 +2289,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refinalize.select.arm.flip (type $void) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $void2 - ;; NOMNL-NEXT: (ref.func $refinalize.select.arm) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $refinalize.select.arm.flip ;; Flipped of the above. (drop @@ -3323,13 +2309,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $refinalize.select.arm.unknown (type $i32_=>_none) (param $x i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.cast $void2 - ;; NOMNL-NEXT: (ref.func $refinalize.select.arm) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $refinalize.select.arm.unknown (param $x i32) ;; As above but use an unknown value at compile time for the condition. (drop @@ -3354,17 +2333,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-null-bottom-ref (type $none_=>_ref|func|) (result (ref func)) - ;; NOMNL-NEXT: (local $0 funcref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.tee $0 - ;; NOMNL-NEXT: (loop (result (ref nofunc)) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $non-null-bottom-ref (result (ref func)) (local $0 (ref null func)) ;; The reference is uninhabitable, a non-null bottom type. The cast is not @@ -3388,12 +2356,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-null-bottom-cast (type $none_=>_ref|nofunc|) (result (ref nofunc)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.func $non-null-bottom-cast) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $non-null-bottom-cast (result (ref nofunc)) ;; As above, but now the cast is uninhabitable. (ref.cast nofunc @@ -3413,18 +2375,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-null-bottom-ref-test (type $none_=>_i32) (result i32) - ;; NOMNL-NEXT: (local $0 funcref) - ;; NOMNL-NEXT: (i32.eqz - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.tee $0 - ;; NOMNL-NEXT: (loop (result (ref nofunc)) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $non-null-bottom-ref-test (result i32) (local $0 (ref null func)) ;; As above, but ref.test instead of cast. This is ok - we can turn the test @@ -3448,15 +2398,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-null-bottom-ref-test-notee (type $none_=>_i32) (result i32) - ;; NOMNL-NEXT: (local $0 funcref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (loop - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $non-null-bottom-ref-test-notee (result i32) (local $0 (ref null func)) ;; As above, but without an intermediate local.tee. Now ref.test will see @@ -3474,12 +2415,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) - ;; NOMNL: (func $non-null-bottom-test (type $none_=>_i32) (result i32) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.func $non-null-bottom-cast) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) (func $non-null-bottom-test (result i32) ;; As above, but now the cast type is uninhabitable, and also use ref.test. ;; This cast cannot succeed, so return 0. diff --git a/test/lit/passes/precompute-gc.wast b/test/lit/passes/precompute-gc.wast index 782cf9b06..926c412b3 100644 --- a/test/lit/passes/precompute-gc.wast +++ b/test/lit/passes/precompute-gc.wast @@ -1,26 +1,21 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. + ;; RUN: wasm-opt %s --remove-unused-names --precompute-propagate --fuzz-exec -all -S -o - \ ;; RUN: | filecheck %s -;; RUN: wasm-opt %s --remove-unused-names --precompute-propagate --fuzz-exec -all --nominal -S -o - \ -;; RUN: | filecheck %s --check-prefix=NOMNL (module ;; CHECK: (type $empty (struct )) - ;; NOMNL: (type $empty (struct )) (type $empty (struct)) ;; CHECK: (type $struct (struct (field (mut i32)))) - ;; NOMNL: (type $struct (struct (field (mut i32)))) (type $struct (struct (mut i32))) ;; two incompatible struct types (type $A (struct (field (mut f32)))) + ;; CHECK: (type $func-return-i32 (func (result i32))) ;; CHECK: (type $B (struct (field (mut f64)))) - ;; NOMNL: (type $func-return-i32 (func (result i32))) - - ;; NOMNL: (type $B (struct (field (mut f64)))) (type $B (struct (field (mut f64)))) (type $struct_i8 (struct (field i8))) @@ -30,7 +25,6 @@ (type $func-return-i32 (func (result i32))) ;; CHECK: (import "fuzzing-support" "log-i32" (func $log (param i32))) - ;; NOMNL: (import "fuzzing-support" "log-i32" (func $log (param i32))) (import "fuzzing-support" "log-i32" (func $log (param i32))) ;; CHECK: (func $test-fallthrough (type $func-return-i32) (result i32) @@ -45,18 +39,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) - ;; NOMNL: (func $test-fallthrough (type $func-return-i32) (result i32) - ;; NOMNL-NEXT: (local $x funcref) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (block (result nullfuncref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $test-fallthrough) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (ref.null nofunc) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) (func $test-fallthrough (result i32) (local $x funcref) (local.set $x @@ -109,38 +91,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $load-from-struct (type $none_=>_none) - ;; NOMNL-NEXT: (local $x (ref null $struct)) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (struct.new $struct - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $log - ;; NOMNL-NEXT: (struct.get $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (struct.new $struct - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $log - ;; NOMNL-NEXT: (struct.get $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.set $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (i32.const 3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $log - ;; NOMNL-NEXT: (struct.get $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $load-from-struct (local $x (ref null $struct)) (local.set $x @@ -192,27 +142,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $load-from-struct-bad-merge (type $i32_=>_none) (param $i i32) - ;; NOMNL-NEXT: (local $x (ref null $struct)) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (local.get $i) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (struct.new $struct - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (struct.new $struct - ;; NOMNL-NEXT: (i32.const 2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $log - ;; NOMNL-NEXT: (struct.get $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $load-from-struct-bad-merge (param $i i32) (local $x (ref null $struct)) ;; a merge of two different $x values cannot be precomputed @@ -244,17 +173,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $modify-gc-heap (type $ref?|$struct|_=>_none) (param $x (ref null $struct)) - ;; NOMNL-NEXT: (struct.set $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (i32.add - ;; NOMNL-NEXT: (struct.get $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $modify-gc-heap (param $x (ref null $struct)) (struct.set $struct 0 (local.get $x) @@ -284,22 +202,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $load-from-struct-bad-escape (type $none_=>_none) - ;; NOMNL-NEXT: (local $x (ref null $struct)) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (struct.new $struct - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $modify-gc-heap - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $log - ;; NOMNL-NEXT: (struct.get $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $load-from-struct-bad-escape (export "test") (local $x (ref null $struct)) (local.set $x @@ -321,13 +223,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $load-from-struct-bad-arrive (type $ref?|$struct|_=>_none) (param $x (ref null $struct)) - ;; NOMNL-NEXT: (call $log - ;; NOMNL-NEXT: (struct.get $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $load-from-struct-bad-arrive (param $x (ref null $struct)) ;; a parameter cannot be precomputed (call $log @@ -359,31 +254,6 @@ ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref-comparisons (type $ref?|$struct|_ref?|$struct|_=>_none) (param $x (ref null $struct)) (param $y (ref null $struct)) - ;; NOMNL-NEXT: (local $z (ref null $struct)) - ;; NOMNL-NEXT: (local $w (ref null $struct)) - ;; NOMNL-NEXT: (call $log - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $log - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $log - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $log - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref-comparisons (param $x (ref null $struct)) (param $y (ref null $struct)) @@ -434,23 +304,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) - ;; NOMNL: (func $new-ref-comparisons (type $func-return-i32) (result i32) - ;; NOMNL-NEXT: (local $x (ref null $struct)) - ;; NOMNL-NEXT: (local $y (ref null $struct)) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (struct.new $struct - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $y - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) (func $new-ref-comparisons (result i32) (local $x (ref null $struct)) (local $y (ref null $struct)) @@ -487,19 +340,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) - ;; NOMNL: (func $propagate-equal (type $func-return-i32) (result i32) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local $tempref (ref null $empty)) - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.tee $tempref - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $tempref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) (func $propagate-equal (result i32) (local $tempresult i32) (local $tempref (ref null $empty)) @@ -525,14 +365,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) - ;; NOMNL: (func $propagate-unequal (type $func-return-i32) (result i32) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local $tempref (ref null $empty)) - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) (func $propagate-unequal (result i32) (local $tempresult i32) (local $tempref (ref null $empty)) @@ -561,17 +393,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $tempresult) ;; CHECK-NEXT: ) - ;; NOMNL: (func $propagate-uncertain-param (type $ref|$empty|_=>_i32) (param $input (ref $empty)) (result i32) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local $tempref (ref null $empty)) - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: (local.get $input) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $tempresult) - ;; NOMNL-NEXT: ) (func $propagate-uncertain-param (param $input (ref $empty)) (result i32) (local $tempresult i32) (local $tempref (ref null $empty)) @@ -596,16 +417,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $tempresult) ;; CHECK-NEXT: ) - ;; NOMNL: (func $propagate-different-params (type $ref|$empty|_ref|$empty|_=>_i32) (param $input1 (ref $empty)) (param $input2 (ref $empty)) (result i32) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $input1) - ;; NOMNL-NEXT: (local.get $input2) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $tempresult) - ;; NOMNL-NEXT: ) (func $propagate-different-params (param $input1 (ref $empty)) (param $input2 (ref $empty)) (result i32) (local $tempresult i32) (local.set $tempresult @@ -628,16 +439,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $tempresult) ;; CHECK-NEXT: ) - ;; NOMNL: (func $propagate-same-param (type $ref|$empty|_=>_i32) (param $input (ref $empty)) (result i32) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $input) - ;; NOMNL-NEXT: (local.get $input) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $tempresult) - ;; NOMNL-NEXT: ) (func $propagate-same-param (param $input (ref $empty)) (result i32) (local $tempresult i32) (local.set $tempresult @@ -677,32 +478,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $tempresult) ;; CHECK-NEXT: ) - ;; NOMNL: (func $propagate-uncertain-local (type $func-return-i32) (result i32) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local $tempref (ref null $empty)) - ;; NOMNL-NEXT: (local $stashedref (ref null $empty)) - ;; NOMNL-NEXT: (local.set $tempref - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $stashedref - ;; NOMNL-NEXT: (local.get $tempref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $tempref - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $tempref) - ;; NOMNL-NEXT: (local.get $stashedref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $tempresult) - ;; NOMNL-NEXT: ) (func $propagate-uncertain-local (result i32) (local $tempresult i32) (local $tempref (ref null $empty)) @@ -759,33 +534,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $propagate-uncertain-loop (type $none_=>_none) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local $tempref (ref null $empty)) - ;; NOMNL-NEXT: (local $stashedref (ref null $empty)) - ;; NOMNL-NEXT: (local.set $tempref - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $stashedref - ;; NOMNL-NEXT: (local.get $tempref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (loop $loop - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $tempref) - ;; NOMNL-NEXT: (local.get $stashedref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $tempref - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (br_if $loop - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (local.get $tempresult) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $propagate-uncertain-loop (local $tempresult i32) (local $tempref (ref null $empty)) @@ -837,27 +585,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $propagate-certain-loop (type $none_=>_none) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local $tempref (ref null $empty)) - ;; NOMNL-NEXT: (local $stashedref (ref null $empty)) - ;; NOMNL-NEXT: (local.set $tempref - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $stashedref - ;; NOMNL-NEXT: (local.get $tempref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (loop $loop - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (br_if $loop - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $propagate-certain-loop (local $tempresult i32) (local $tempref (ref null $empty)) @@ -906,27 +633,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $propagate-certain-loop-2 (type $none_=>_none) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local $tempref (ref null $empty)) - ;; NOMNL-NEXT: (local $stashedref (ref null $empty)) - ;; NOMNL-NEXT: (loop $loop - ;; NOMNL-NEXT: (local.set $tempref - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $stashedref - ;; NOMNL-NEXT: (local.get $tempref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (br_if $loop - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $propagate-certain-loop-2 (local $tempresult i32) (local $tempref (ref null $empty)) @@ -983,35 +689,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $propagate-possibly-certain-loop (type $none_=>_none) - ;; NOMNL-NEXT: (local $tempresult i32) - ;; NOMNL-NEXT: (local $tempref (ref null $empty)) - ;; NOMNL-NEXT: (local $stashedref (ref null $empty)) - ;; NOMNL-NEXT: (loop $loop - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $tempref - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $stashedref - ;; NOMNL-NEXT: (local.get $tempref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $tempresult - ;; NOMNL-NEXT: (ref.eq - ;; NOMNL-NEXT: (local.get $tempref) - ;; NOMNL-NEXT: (local.get $stashedref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (br_if $loop - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (local.get $tempresult) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $propagate-possibly-certain-loop (local $tempresult i32) (local $tempref (ref null $empty)) @@ -1049,9 +726,6 @@ ;; CHECK: (func $helper (type $i32_=>_i32) (param $0 i32) (result i32) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $helper (type $i32_=>_i32) (param $0 i32) (result i32) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $helper (param i32) (result i32) (unreachable) ) @@ -1070,20 +744,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $odd-cast-and-get (type $none_=>_none) - ;; NOMNL-NEXT: (local $temp (ref null $B)) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $odd-cast-and-get (local $temp (ref null $B)) ;; Try to cast a null of A to B. While the types are incompatible, ref.cast @@ -1121,23 +781,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $odd-cast-and-get-tuple (type $none_=>_none) - ;; NOMNL-NEXT: (local $temp ((ref null $B) i32)) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (tuple.make - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: (i32.const 10) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $odd-cast-and-get-tuple (local $temp ((ref null $B) i32)) ;; As above, but with a tuple. @@ -1161,9 +804,6 @@ ;; CHECK: (func $receive-f64 (type $f64_=>_none) (param $0 f64) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $receive-f64 (type $f64_=>_none) (param $0 f64) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $receive-f64 (param f64) (unreachable) ) @@ -1180,18 +820,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $odd-cast-and-get-non-null (type $ref|$func-return-i32|_=>_none) (param $temp (ref $func-return-i32)) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (ref.cast $func-return-i32 - ;; NOMNL-NEXT: (ref.func $receive-f64) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call_ref $func-return-i32 - ;; NOMNL-NEXT: (local.get $temp) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $odd-cast-and-get-non-null (param $temp (ref $func-return-i32)) ;; Try to cast a function to an incompatible type. (local.set $temp @@ -1218,16 +846,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $new_block_unreachable (type $none_=>_anyref) (result anyref) - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $new_block_unreachable (result anyref) (struct.new $struct ;; The value is a block with an unreachable. precompute will get rid of the @@ -1249,16 +867,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $br_on_cast-on-creation (type $none_=>_ref|$empty|) (result (ref $empty)) - ;; NOMNL-NEXT: (block $label (result (ref $empty)) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (br_on_cast $label $empty - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $br_on_cast-on-creation (result (ref $empty)) (block $label (result (ref $empty)) (drop @@ -1302,38 +910,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ref.is_null (type $i32_=>_none) (param $param i32) - ;; NOMNL-NEXT: (local $ref (ref null $empty)) - ;; NOMNL-NEXT: (local.set $ref - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $ref - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (local.get $param) - ;; NOMNL-NEXT: (local.set $ref - ;; NOMNL-NEXT: (struct.new_default $empty) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (ref.is_null - ;; NOMNL-NEXT: (local.get $ref) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ref.is_null (param $param i32) (local $ref (ref null $empty)) ;; Test ref.null on references, and also test that we can infer multiple @@ -1391,21 +967,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $remove-set (type $none_=>_ref|func|) (result (ref func)) - ;; NOMNL-NEXT: (local $nn funcref) - ;; NOMNL-NEXT: (local $i i32) - ;; NOMNL-NEXT: (loop $loop - ;; NOMNL-NEXT: (local.set $i - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (br $loop) - ;; NOMNL-NEXT: (return - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $nn) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $remove-set (result (ref func)) (local $nn (ref func)) (local $i i32) @@ -1446,18 +1007,6 @@ ;; CHECK-NEXT: (string.const "hello, world") ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $strings (type $ref|string|_=>_none) (param $param (ref string)) - ;; NOMNL-NEXT: (local $s (ref string)) - ;; NOMNL-NEXT: (local.set $s - ;; NOMNL-NEXT: (string.const "hello, world") - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $strings - ;; NOMNL-NEXT: (string.const "hello, world") - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $strings - ;; NOMNL-NEXT: (string.const "hello, world") - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $strings (param $param (ref string)) (local $s (ref string)) (local.set $s @@ -1475,9 +1024,6 @@ ;; CHECK: (func $struct.new.packed (type $func-return-i32) (result i32) ;; CHECK-NEXT: (i32.const 120) ;; CHECK-NEXT: ) - ;; NOMNL: (func $struct.new.packed (type $func-return-i32) (result i32) - ;; NOMNL-NEXT: (i32.const 120) - ;; NOMNL-NEXT: ) (func $struct.new.packed (result i32) ;; Truncation happens when we write to this packed i8 field, so the result we ;; read back is 0x12345678 & 0xff which is 0x78 == 120. diff --git a/test/lit/passes/roundtrip-gc-types.wast b/test/lit/passes/roundtrip-gc-types.wast index 7397d08ba..48876c7cf 100644 --- a/test/lit/passes/roundtrip-gc-types.wast +++ b/test/lit/passes/roundtrip-gc-types.wast @@ -1,6 +1,6 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. + ;; RUN: wasm-opt %s -all --roundtrip -S -o - | filecheck %s -;; RUN: wasm-opt %s -all --roundtrip --nominal -S -o - | filecheck %s --check-prefix NOMNL ;; Regression test for an issue in which roundtripping failed to reproduce the ;; original types because type canonicalization was incorrect when the canonical @@ -10,28 +10,21 @@ (rec ;; CHECK: (rec ;; CHECK-NEXT: (type $A (struct (field (ref $C)))) - ;; NOMNL: (type $A (struct (field (ref $C)))) (type $A (struct (field (ref $C)))) - ;; CHECK: (type $B (func (param (ref $A)) (result (ref $B)))) - ;; NOMNL: (type $C (struct (field (mut (ref $B))))) - ;; NOMNL: (type $B (func (param (ref $A)) (result (ref $B)))) + ;; CHECK: (type $B (func (param (ref $A)) (result (ref $B)))) (type $B (func (param (ref $A)) (result (ref $B)))) ;; CHECK: (type $C (struct (field (mut (ref $B))))) (type $C (struct (field (mut (ref $B))))) ;; CHECK: (type $D (struct_subtype (field (ref $C)) (field (ref $A)) $A)) - ;; NOMNL: (type $D (struct_subtype (field (ref $C)) (field (ref $A)) $A)) (type $D (struct_subtype (field (ref $C)) (field (ref $A)) $A)) ) ;; CHECK: (func $use-types (type $ref|$A|_ref|$D|_=>_none) (param $0 (ref $A)) (param $1 (ref $D)) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $use-types (type $ref|$A|_ref|$D|_=>_none) (param $0 (ref $A)) (param $1 (ref $D)) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $use-types (param (ref $A) (ref $D)) (nop) ) diff --git a/test/lit/passes/roundtrip-gc.wast b/test/lit/passes/roundtrip-gc.wast index 7a22d7ec3..9f5971b83 100644 --- a/test/lit/passes/roundtrip-gc.wast +++ b/test/lit/passes/roundtrip-gc.wast @@ -1,11 +1,9 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. ;; RUN: wasm-opt %s -all --generate-stack-ir --optimize-stack-ir --roundtrip -S -o - | filecheck %s -;; RUN: wasm-opt %s -all --generate-stack-ir --optimize-stack-ir --roundtrip --nominal -S -o - | filecheck %s --check-prefix NOMNL (module (type ${i32} (struct (field i32))) ;; CHECK: (export "export" (func $test)) - ;; NOMNL: (export "export" (func $test)) (export "export" (func $test)) ;; CHECK: (func $test (type $none_=>_none) ;; CHECK-NEXT: (local $0 (ref $\7bi32\7d)) @@ -20,19 +18,6 @@ ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $test (type $none_=>_none) - ;; NOMNL-NEXT: (local $0 (ref $\7bi32\7d)) - ;; NOMNL-NEXT: (call $help - ;; NOMNL-NEXT: (block (result (ref $\7bi32\7d)) - ;; NOMNL-NEXT: (local.set $0 - ;; NOMNL-NEXT: (struct.new_default $\7bi32\7d) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $test (call $help (struct.new_default ${i32}) @@ -49,9 +34,6 @@ ;; CHECK: (func $help (type $ref|$\7bi32\7d|_i32_=>_none) (param $3 (ref $\7bi32\7d)) (param $4 i32) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $help (type $ref|$\7bi32\7d|_i32_=>_none) (param $3 (ref $\7bi32\7d)) (param $4 i32) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $help (param $3 (ref ${i32})) (param $4 i32) (nop) ) diff --git a/test/lit/passes/simplify-locals-gc.wast b/test/lit/passes/simplify-locals-gc.wast index 38a7d79d8..0d22ecaaa 100644 --- a/test/lit/passes/simplify-locals-gc.wast +++ b/test/lit/passes/simplify-locals-gc.wast @@ -1,8 +1,7 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. + ;; RUN: wasm-opt %s --simplify-locals -all -S -o - \ ;; RUN: | filecheck %s -;; RUN: wasm-opt %s --simplify-locals -all --nominal -S -o - \ -;; RUN: | filecheck %s --check-prefix=NOMNL (module ;; CHECK: (type $A (struct (field structref))) @@ -10,15 +9,9 @@ ;; CHECK: (type $B (struct_subtype (field (ref struct)) $A)) ;; CHECK: (type $struct (struct (field (mut i32)))) - ;; NOMNL: (type $A (struct (field structref))) - - ;; NOMNL: (type $B (struct_subtype (field (ref struct)) $A)) - - ;; NOMNL: (type $struct (struct (field (mut i32)))) (type $struct (struct (field (mut i32)))) ;; CHECK: (type $struct-immutable (struct (field i32))) - ;; NOMNL: (type $struct-immutable (struct (field i32))) (type $struct-immutable (struct (field i32))) (type $A (struct_subtype (field (ref null struct)) data)) @@ -41,19 +34,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $temp) ;; CHECK-NEXT: ) - ;; NOMNL: (func $no-reorder-past-write (type $ref|$struct|_=>_i32) (param $x (ref $struct)) (result i32) - ;; NOMNL-NEXT: (local $temp i32) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (struct.get $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.set $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (i32.const 42) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $temp) - ;; NOMNL-NEXT: ) (func $no-reorder-past-write (param $x (ref $struct)) (result i32) (local $temp i32) (local.set $temp @@ -79,17 +59,6 @@ ;; CHECK-NEXT: (local.get $y) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $reorder-past-write-if-immutable (type $ref|$struct|_ref|$struct-immutable|_=>_i32) (param $x (ref $struct)) (param $y (ref $struct-immutable)) (result i32) - ;; NOMNL-NEXT: (local $temp i32) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (struct.set $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (i32.const 42) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.get $struct-immutable 0 - ;; NOMNL-NEXT: (local.get $y) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $reorder-past-write-if-immutable (param $x (ref $struct)) (param $y (ref $struct-immutable)) (result i32) (local $temp i32) (local.set $temp @@ -120,22 +89,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $temp) ;; CHECK-NEXT: ) - ;; NOMNL: (func $unreachable-struct.get (type $ref|$struct|_ref|$struct-immutable|_=>_i32) (param $x (ref $struct)) (param $y (ref $struct-immutable)) (result i32) - ;; NOMNL-NEXT: (local $temp i32) - ;; NOMNL-NEXT: (local.tee $temp - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (struct.set $struct 0 - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: (i32.const 42) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $temp) - ;; NOMNL-NEXT: ) (func $unreachable-struct.get (param $x (ref $struct)) (param $y (ref $struct-immutable)) (result i32) (local $temp i32) ;; As above, but the get's ref is unreachable. This tests we do not hit an @@ -176,28 +129,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $no-block-values-if-br_on (type $none_=>_none) - ;; NOMNL-NEXT: (local $temp anyref) - ;; NOMNL-NEXT: (block $block - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (br_on_null $block - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (br $block) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $temp) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $no-block-values-if-br_on (local $temp (ref null any)) (block $block @@ -248,23 +179,6 @@ ;; CHECK-NEXT: (local.get $x) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $if-nnl (type $none_=>_none) - ;; NOMNL-NEXT: (local $x (ref func)) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (ref.func $if-nnl) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (local.tee $x - ;; NOMNL-NEXT: (ref.func $if-nnl) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $if-nnl (local $x (ref func)) ;; We want to turn this if into an if-else with a set on the outside: @@ -318,26 +232,6 @@ ;; CHECK-NEXT: (local.get $x) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $if-nnl-previous-set (type $none_=>_none) - ;; NOMNL-NEXT: (local $x (ref func)) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (ref.func $if-nnl) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (if - ;; NOMNL-NEXT: (i32.const 1) - ;; NOMNL-NEXT: (local.set $x - ;; NOMNL-NEXT: (ref.func $if-nnl) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (local.tee $x - ;; NOMNL-NEXT: (ref.func $if-nnl) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $helper - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $if-nnl-previous-set (local $x (ref func)) ;; As the above testcase, but now there is a set before the if. We could @@ -364,9 +258,6 @@ ;; CHECK: (func $helper (type $ref|func|_=>_none) (param $ref (ref func)) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $helper (type $ref|func|_=>_none) (param $ref (ref func)) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $helper (param $ref (ref func)) ) @@ -377,13 +268,6 @@ ;; CHECK-NEXT: (local.get $b) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $needs-refinalize (type $ref|$B|_=>_anyref) (param $b (ref $B)) (result anyref) - ;; NOMNL-NEXT: (local $a (ref null $A)) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (struct.get $B 0 - ;; NOMNL-NEXT: (local.get $b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $needs-refinalize (param $b (ref $B)) (result anyref) (local $a (ref null $A)) (local.set $a @@ -409,18 +293,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.get $temp) ;; CHECK-NEXT: ) - ;; NOMNL: (func $call-vs-mutable-read (type $ref|$struct|_=>_i32) (param $0 (ref $struct)) (result i32) - ;; NOMNL-NEXT: (local $temp i32) - ;; NOMNL-NEXT: (local.set $temp - ;; NOMNL-NEXT: (call $side-effect) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.get $struct 0 - ;; NOMNL-NEXT: (local.get $0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (local.get $temp) - ;; NOMNL-NEXT: ) (func $call-vs-mutable-read (param $0 (ref $struct)) (result i32) (local $temp i32) (local.set $temp @@ -441,9 +313,6 @@ ;; CHECK: (func $side-effect (type $none_=>_i32) (result i32) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $side-effect (type $none_=>_i32) (result i32) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $side-effect (result i32) ;; Helper function for the above. (unreachable) @@ -461,18 +330,6 @@ ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: (local.get $nn-any) ;; CHECK-NEXT: ) - ;; NOMNL: (func $pick-refined (type $ref|any|_=>_anyref) (param $nn-any (ref any)) (result anyref) - ;; NOMNL-NEXT: (local $any anyref) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (call $use-any - ;; NOMNL-NEXT: (local.get $nn-any) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $use-nn-any - ;; NOMNL-NEXT: (local.get $nn-any) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (local.get $nn-any) - ;; NOMNL-NEXT: ) (func $pick-refined (param $nn-any (ref any)) (result anyref) (local $any anyref) (local.set $any @@ -511,22 +368,6 @@ ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: (local.get $nn-any) ;; CHECK-NEXT: ) - ;; NOMNL: (func $pick-casted (type $anyref_=>_anyref) (param $any anyref) (result anyref) - ;; NOMNL-NEXT: (local $nn-any (ref any)) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (call $use-any - ;; NOMNL-NEXT: (local.tee $nn-any - ;; NOMNL-NEXT: (ref.as_non_null - ;; NOMNL-NEXT: (local.get $any) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (call $use-nn-any - ;; NOMNL-NEXT: (local.get $nn-any) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (local.get $nn-any) - ;; NOMNL-NEXT: ) (func $pick-casted (param $any anyref) (result anyref) (local $nn-any (ref any)) (local.set $nn-any @@ -561,18 +402,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $pick-fallthrough (type $i32_=>_none) (param $x i32) - ;; NOMNL-NEXT: (local $t i32) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block (result i32) - ;; NOMNL-NEXT: (local.get $x) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $pick-fallthrough (param $x i32) (local $t i32) ;; Similar to the above test wth looking through a cast, but using a non-gc @@ -621,34 +450,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $ignore-unrefined (type $ref|$A|_=>_none) (param $A (ref $A)) - ;; NOMNL-NEXT: (local $B (ref null $B)) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.get $A 0 - ;; NOMNL-NEXT: (local.get $A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.get $B 0 - ;; NOMNL-NEXT: (local.tee $B - ;; NOMNL-NEXT: (ref.cast $B - ;; NOMNL-NEXT: (local.get $A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.get $A 0 - ;; NOMNL-NEXT: (local.get $A) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.get $B 0 - ;; NOMNL-NEXT: (local.get $B) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $ignore-unrefined (param $A (ref $A)) ;; $A is a supertype, but non-nullable; $B is a subtype, but nullable. We ;; should not switch any of the gets from $B to $A: that would improve @@ -686,9 +487,6 @@ ;; CHECK: (func $use-nn-any (type $ref|any|_=>_none) (param $nn-any (ref any)) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $use-nn-any (type $ref|any|_=>_none) (param $nn-any (ref any)) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $use-nn-any (param $nn-any (ref any)) ;; Helper function for the above. ) @@ -696,9 +494,6 @@ ;; CHECK: (func $use-any (type $anyref_=>_none) (param $any anyref) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; NOMNL: (func $use-any (type $anyref_=>_none) (param $any anyref) - ;; NOMNL-NEXT: (nop) - ;; NOMNL-NEXT: ) (func $use-any (param $any anyref) ;; Helper function for the above. ) @@ -708,11 +503,6 @@ ;; CHECK-NEXT: (local.get $b) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $remove-tee-refinalize (type $ref?|$A|_ref?|$B|_=>_structref) (param $a (ref null $A)) (param $b (ref null $B)) (result structref) - ;; NOMNL-NEXT: (struct.get $B 0 - ;; NOMNL-NEXT: (local.get $b) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $remove-tee-refinalize (param $a (ref null $A)) (param $b (ref null $B)) diff --git a/test/lit/passes/type-ssa.wast b/test/lit/passes/type-ssa.wast index 943915b95..93225ed70 100644 --- a/test/lit/passes/type-ssa.wast +++ b/test/lit/passes/type-ssa.wast @@ -1,6 +1,6 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. -;; RUN: foreach %s %t wasm-opt --type-ssa -all -S -o - | filecheck %s -;; RUN: foreach %s %t wasm-opt --nominal --type-ssa -all -S -o - | filecheck %s --check-prefix NOMNL + +;; RUN: foreach %s %t wasm-opt --type-ssa -all -S -o - | filecheck %s ;; Test in both isorecursive and nominal modes to make sure we create the new ;; types properly in both. @@ -8,7 +8,6 @@ ;; Every struct.new here should get a new type. (module ;; CHECK: (type $struct (struct (field i32))) - ;; NOMNL: (type $struct (struct (field i32))) (type $struct (struct_subtype (field i32) data)) ;; CHECK: (type $none_=>_none (func)) @@ -27,21 +26,6 @@ ;; CHECK: (global $g (ref $struct) (struct.new $struct$4 ;; CHECK-NEXT: (i32.const 42) ;; CHECK-NEXT: )) - ;; NOMNL: (type $none_=>_none (func)) - - ;; NOMNL: (type $struct$4 (struct_subtype (field i32) $struct)) - - ;; NOMNL: (type $struct$5 (struct_subtype (field i32) $struct)) - - ;; NOMNL: (type $struct$1 (struct_subtype (field i32) $struct)) - - ;; NOMNL: (type $struct$2 (struct_subtype (field i32) $struct)) - - ;; NOMNL: (type $struct$3 (struct_subtype (field i32) $struct)) - - ;; NOMNL: (global $g (ref $struct) (struct.new $struct$4 - ;; NOMNL-NEXT: (i32.const 42) - ;; NOMNL-NEXT: )) (global $g (ref $struct) (struct.new $struct (i32.const 42) )) @@ -49,9 +33,6 @@ ;; CHECK: (global $h (ref $struct) (struct.new $struct$5 ;; CHECK-NEXT: (i32.const 42) ;; CHECK-NEXT: )) - ;; NOMNL: (global $h (ref $struct) (struct.new $struct$5 - ;; NOMNL-NEXT: (i32.const 42) - ;; NOMNL-NEXT: )) (global $h (ref $struct) (struct.new $struct (i32.const 42) )) @@ -66,16 +47,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $foo (type $none_=>_none) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.new_default $struct$1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.new $struct$2 - ;; NOMNL-NEXT: (i32.const 10) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $foo (drop (struct.new_default $struct) @@ -94,13 +65,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $another-func (type $none_=>_none) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.new $struct$3 - ;; NOMNL-NEXT: (i32.const 100) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $another-func (drop (struct.new $struct @@ -112,12 +76,10 @@ ;; Some of these are uninteresting and should not get a new type. (module + ;; CHECK: (type $anyref_arrayref_=>_none (func (param anyref arrayref))) ;; CHECK: (type $struct (struct (field anyref))) - ;; NOMNL: (type $anyref_arrayref_=>_none (func (param anyref arrayref))) - - ;; NOMNL: (type $struct (struct (field anyref))) (type $struct (struct_subtype (field (ref null any)) data)) ;; CHECK: (rec @@ -155,40 +117,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (type $struct$1 (struct_subtype (field anyref) $struct)) - - ;; NOMNL: (type $struct$2 (struct_subtype (field anyref) $struct)) - - ;; NOMNL: (type $struct$3 (struct_subtype (field anyref) $struct)) - - ;; NOMNL: (func $foo (type $anyref_arrayref_=>_none) (param $any anyref) (param $array arrayref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.new_default $struct$1) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.new $struct$2 - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.new $struct - ;; NOMNL-NEXT: (local.get $any) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.new $struct$3 - ;; NOMNL-NEXT: (local.get $array) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (block ;; (replaces something unreachable we can't emit) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $foo (param $any (ref null any)) (param $array (ref null array)) ;; A null is interesting. (drop @@ -222,26 +150,13 @@ (module ;; CHECK: (type $array (array (mut anyref))) - ;; NOMNL: (type $array (array (mut anyref))) (type $array (array (mut (ref null any)))) ;; CHECK: (type $ref|i31|_anyref_=>_none (func (param (ref i31) anyref))) ;; CHECK: (type $array-func (array (mut funcref))) - ;; NOMNL: (type $ref|i31|_anyref_=>_none (func (param (ref i31) anyref))) - - ;; NOMNL: (type $array$1 (array_subtype (mut anyref) $array)) - - ;; NOMNL: (type $array$2 (array_subtype (mut anyref) $array)) - - ;; NOMNL: (type $array$3 (array_subtype (mut anyref) $array)) - - ;; NOMNL: (type $none_=>_none (func)) - - ;; NOMNL: (type $array-func (array (mut funcref))) (type $array-func (array (mut funcref))) - (elem func $array.new) ;; CHECK: (rec @@ -286,39 +201,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (type $array-func$4 (array_subtype (mut funcref) $array-func)) - - ;; NOMNL: (type $array$5 (array_subtype (mut anyref) $array)) - - ;; NOMNL: (type $array$6 (array_subtype (mut anyref) $array)) - - ;; NOMNL: (elem $0 func $array.new) - - ;; NOMNL: (func $array.new (type $ref|i31|_anyref_=>_none) (param $refined (ref i31)) (param $null-any anyref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.new_default $array$1 - ;; NOMNL-NEXT: (i32.const 5) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.new $array$2 - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: (i32.const 5) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.new $array$3 - ;; NOMNL-NEXT: (local.get $refined) - ;; NOMNL-NEXT: (i32.const 5) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.new $array - ;; NOMNL-NEXT: (local.get $null-any) - ;; NOMNL-NEXT: (i32.const 5) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $array.new (param $refined (ref i31)) (param $null-any (ref null any)) ;; Default null, an interesting value, so we get a new type. (drop @@ -357,14 +239,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $array.new_seg (type $none_=>_none) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.new_elem $array-func$4 $0 - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: (i32.const 3) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $array.new_seg ;; We consider all new_elem to be interesting as we don't look at the elem ;; data yet. @@ -399,29 +273,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $array.new_fixed (type $ref|i31|_anyref_=>_none) (param $refined (ref i31)) (param $null-any anyref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.new_fixed $array$5 - ;; NOMNL-NEXT: (ref.null none) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.new_fixed $array$6 - ;; NOMNL-NEXT: (local.get $refined) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.new_fixed $array - ;; NOMNL-NEXT: (local.get $null-any) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (array.new_fixed $array - ;; NOMNL-NEXT: (local.get $refined) - ;; NOMNL-NEXT: (local.get $null-any) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $array.new_fixed (param $refined (ref i31)) (param $null-any (ref null any)) ;; Null, interesting, so we get a new type. (drop @@ -460,7 +311,6 @@ ;; but that is not important here.) (module ;; CHECK: (type $empty (struct )) - ;; NOMNL: (type $empty (struct )) (type $empty (struct)) ;; CHECK: (type $empty$1 (struct_subtype $empty)) @@ -468,15 +318,9 @@ ;; CHECK: (type $anyref_=>_none (func (param anyref))) ;; CHECK: (type $struct (struct (field externref) (field anyref) (field externref))) - ;; NOMNL: (type $empty$1 (struct_subtype $empty)) - - ;; NOMNL: (type $anyref_=>_none (func (param anyref))) - - ;; NOMNL: (type $struct (struct (field externref) (field anyref) (field externref))) (type $struct (struct externref anyref externref)) ;; CHECK: (global $g (mut anyref) (struct.new_default $empty$1)) - ;; NOMNL: (global $g (mut anyref) (struct.new_default $empty$1)) (global $g (mut anyref) (struct.new $empty)) ;; CHECK: (func $0 (type $anyref_=>_none) (param $param anyref) @@ -496,23 +340,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $0 (type $anyref_=>_none) (param $param anyref) - ;; NOMNL-NEXT: (drop - ;; NOMNL-NEXT: (struct.new $struct - ;; NOMNL-NEXT: (extern.externalize - ;; NOMNL-NEXT: (global.get $g) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (extern.internalize - ;; NOMNL-NEXT: (extern.externalize - ;; NOMNL-NEXT: (global.get $g) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: (extern.externalize - ;; NOMNL-NEXT: (local.get $param) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $0 (param $param anyref) (drop (struct.new $struct diff --git a/test/lit/tail-call.wast b/test/lit/tail-call.wast index f4143e100..a82313bfd 100644 --- a/test/lit/tail-call.wast +++ b/test/lit/tail-call.wast @@ -3,28 +3,20 @@ ;; Check that tail calls are parsed, validated, and printed correctly ;; RUN: foreach %s %t wasm-opt -all -S -o - | filecheck %s -;; RUN: foreach %s %t wasm-opt -all -S --nominal -o - | filecheck %s --check-prefix NOMNL (module - ;; CHECK: (type $void (func)) - ;; NOMNL: (type $void (func)) (type $void (func)) ;; CHECK: (table $t 1 1 funcref) - ;; NOMNL: (table $t 1 1 funcref) (table $t 1 1 funcref) ;; CHECK: (elem $e (i32.const 0) $foo) - ;; NOMNL: (elem $e (i32.const 0) $foo) (elem $e (i32.const 0) $foo) ;; CHECK: (func $foo (type $void) ;; CHECK-NEXT: (return_call $bar) ;; CHECK-NEXT: ) - ;; NOMNL: (func $foo (type $void) - ;; NOMNL-NEXT: (return_call $bar) - ;; NOMNL-NEXT: ) (func $foo (return_call $bar) ) @@ -34,11 +26,6 @@ ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $bar (type $void) - ;; NOMNL-NEXT: (return_call_indirect $t (type $void) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $bar (return_call_indirect (type $void) (i32.const 0)) ) @@ -47,15 +34,9 @@ ;; Check GC types and subtyping (module ;; CHECK: (type $A (struct (field i32))) - ;; NOMNL: (type $return-B (func (result (ref $B)))) - - ;; NOMNL: (type $return-A (func (result (ref null $A)))) - - ;; NOMNL: (type $A (struct (field i32))) (type $A (struct i32)) ;; CHECK: (type $B (struct_subtype (field i32) (field i32) $A)) - ;; NOMNL: (type $B (struct_subtype (field i32) (field i32) $A)) (type $B (struct_subtype i32 i32 $A)) ;; CHECK: (type $return-B (func (result (ref $B)))) @@ -65,19 +46,14 @@ (type $return-A (func (result (ref null $A)))) ;; CHECK: (table $t 1 1 funcref) - ;; NOMNL: (table $t 1 1 funcref) (table $t 1 1 funcref) ;; CHECK: (elem $e (i32.const 0) $callee) - ;; NOMNL: (elem $e (i32.const 0) $callee) (elem $e (i32.const 0) $callee) ;; CHECK: (func $caller (type $return-A) (result (ref null $A)) ;; CHECK-NEXT: (return_call $callee) ;; CHECK-NEXT: ) - ;; NOMNL: (func $caller (type $return-A) (result (ref null $A)) - ;; NOMNL-NEXT: (return_call $callee) - ;; NOMNL-NEXT: ) (func $caller (type $return-A) (return_call $callee) ) @@ -87,11 +63,6 @@ ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; NOMNL: (func $caller-indirect (type $return-B) (result (ref $B)) - ;; NOMNL-NEXT: (return_call_indirect $t (type $return-B) - ;; NOMNL-NEXT: (i32.const 0) - ;; NOMNL-NEXT: ) - ;; NOMNL-NEXT: ) (func $caller-indirect (type $return-B) (return_call_indirect $t (type $return-B) (i32.const 0)) ) @@ -99,9 +70,6 @@ ;; CHECK: (func $callee (type $return-B) (result (ref $B)) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) - ;; NOMNL: (func $callee (type $return-B) (result (ref $B)) - ;; NOMNL-NEXT: (unreachable) - ;; NOMNL-NEXT: ) (func $callee (type $return-B) (unreachable) ) |