diff options
author | Alon Zakai <azakai@google.com> | 2021-08-16 11:30:39 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-16 11:30:39 -0700 |
commit | c68861fbdfeebe8ef8dada7673ad798811540780 (patch) | |
tree | 542608db5e70a1b728245e3c7f047b4e397b27c7 /test | |
parent | 551b9dd9cd3c1194214a35e1b2a9d2f550577ff3 (diff) | |
download | binaryen-c68861fbdfeebe8ef8dada7673ad798811540780.tar.gz binaryen-c68861fbdfeebe8ef8dada7673ad798811540780.tar.bz2 binaryen-c68861fbdfeebe8ef8dada7673ad798811540780.zip |
[Wasm GC] Fix OptimizeInstructions on folding of identical code with nominal typing (#4069)
(if (result i32)
(local.get $x)
(struct.get $B 1
(ref.null $B)
)
(struct.get $C 1
(ref.null $C)
)
)
With structural typing it is safe to turn this into this:
(struct.get $A 1
(if (result (ref $A))
(local.get $x)
(ref.null $B)
(ref.null $C)
)
)
Here $A is the LUB of the others. This works since $A must have
field 1 in it. But with nominal types it is possible that the LUB in fact
does not have that field, and we would not validate.
This actually seems like a more general issue that might happen with
other things, even though atm perhaps it can't. For simplicity, avoid this
pattern in both nominal and structural typing, to avoid making a
difference between them.
Diffstat (limited to 'test')
-rw-r--r-- | test/lit/passes/optimize-instructions-gc.wast | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/test/lit/passes/optimize-instructions-gc.wast b/test/lit/passes/optimize-instructions-gc.wast index 30f6a6c2d..27c966f52 100644 --- a/test/lit/passes/optimize-instructions-gc.wast +++ b/test/lit/passes/optimize-instructions-gc.wast @@ -18,10 +18,21 @@ ;; NOMNL: (type $empty (struct )) (type $empty (struct)) + ;; CHECK: (type $B (struct (field i32) (field i32) (field f32))) + ;; NOMNL: (type $B (struct (field i32) (field i32) (field f32)) (extends $A)) + (type $B (struct (field i32) (field i32) (field f32)) (extends $A)) + + ;; CHECK: (type $C (struct (field i32) (field i32) (field f64))) + ;; NOMNL: (type $C (struct (field i32) (field i32) (field f64)) (extends $A)) + (type $C (struct (field i32) (field i32) (field f64)) (extends $A)) + ;; CHECK: (type $array (array (mut i8))) ;; NOMNL: (type $array (array (mut i8))) (type $array (array (mut i8))) + ;; NOMNL: (type $A (struct (field i32))) + (type $A (struct (field i32))) + ;; 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))) @@ -1612,4 +1623,46 @@ ) ) ) + + ;; CHECK: (func $hoist-LUB-danger (param $x i32) (result i32) + ;; CHECK-NEXT: (if (result i32) + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (struct.get $B 1 + ;; CHECK-NEXT: (ref.null $B) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (struct.get $C 1 + ;; CHECK-NEXT: (ref.null $C) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; NOMNL: (func $hoist-LUB-danger (param $x i32) (result i32) + ;; NOMNL-NEXT: (if (result i32) + ;; NOMNL-NEXT: (local.get $x) + ;; NOMNL-NEXT: (struct.get $B 1 + ;; NOMNL-NEXT: (ref.null $B) + ;; NOMNL-NEXT: ) + ;; NOMNL-NEXT: (struct.get $C 1 + ;; NOMNL-NEXT: (ref.null $C) + ;; NOMNL-NEXT: ) + ;; NOMNL-NEXT: ) + ;; NOMNL-NEXT: ) + (func $hoist-LUB-danger (param $x i32) (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 + ;; error. We disallow subtyping for this reason. + ;; + ;; We also disallow subtyping in structural typing, even though atm there + ;; might not be a concrete risk there: future instructions might introduce + ;; such things, and it reduces the complexity of having differences with + ;; nominal typing. + (if (result i32) + (local.get $x) + (struct.get $B 1 + (ref.null $B) + ) + (struct.get $C 1 + (ref.null $C) + ) + ) + ) ) |