Skip to content

Precompute: Check defaultability, not nullability #6052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Precompute: Check defaultability, not nullability #6052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/passes/Precompute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@ struct Precompute
if (set == nullptr) {
if (getFunction()->isVar(get->index)) {
auto localType = getFunction()->getLocalType(get->index);
if (localType.isNonNullable()) {
// This is a non-nullable local that seems to read the default
if (!localType.isDefaultable()) {
// This is a nondefaultable local that seems to read the default
// value at the function entry. This is either an internal error
// or a case of unreachable code; the latter is possible as
// LocalGraph is not precise in unreachable code.
Expand Down
41 changes: 33 additions & 8 deletions test/lit/passes/precompute-gc.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
(struct.get $struct 0 (local.get $x))
)
)
;; CHECK: (func $ref-comparisons (type $10) (param $x (ref null $struct)) (param $y (ref null $struct))
;; CHECK: (func $ref-comparisons (type $11) (param $x (ref null $struct)) (param $y (ref null $struct))
;; CHECK-NEXT: (local $z (ref null $struct))
;; CHECK-NEXT: (local $w (ref null $struct))
;; CHECK-NEXT: (call $log
Expand Down Expand Up @@ -407,7 +407,7 @@
(local.get $tempresult)
)

;; CHECK: (func $propagate-different-params (type $11) (param $input1 (ref $empty)) (param $input2 (ref $empty)) (result i32)
;; CHECK: (func $propagate-different-params (type $12) (param $input1 (ref $empty)) (param $input2 (ref $empty)) (result i32)
;; CHECK-NEXT: (local $tempresult i32)
;; CHECK-NEXT: (local.set $tempresult
;; CHECK-NEXT: (ref.eq
Expand Down Expand Up @@ -723,7 +723,7 @@
)
)

;; CHECK: (func $helper (type $12) (param $0 i32) (result i32)
;; CHECK: (func $helper (type $13) (param $0 i32) (result i32)
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
(func $helper (param i32) (result i32)
Expand Down Expand Up @@ -801,14 +801,14 @@
)
)

;; CHECK: (func $receive-f64 (type $13) (param $0 f64)
;; CHECK: (func $receive-f64 (type $14) (param $0 f64)
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
(func $receive-f64 (param f64)
(unreachable)
)

;; CHECK: (func $odd-cast-and-get-non-null (type $14) (param $temp (ref $func-return-i32))
;; CHECK: (func $odd-cast-and-get-non-null (type $15) (param $temp (ref $func-return-i32))
;; CHECK-NEXT: (local.set $temp
;; CHECK-NEXT: (ref.cast (ref nofunc)
;; CHECK-NEXT: (ref.func $receive-f64)
Expand Down Expand Up @@ -857,7 +857,7 @@
)
)

;; CHECK: (func $br_on_cast-on-creation (type $15) (result (ref $empty))
;; CHECK: (func $br_on_cast-on-creation (type $16) (result (ref $empty))
;; CHECK-NEXT: (block $label (result (ref $empty))
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (br_on_cast $label (ref $empty) (ref $empty)
Expand Down Expand Up @@ -952,7 +952,7 @@
)
)

;; CHECK: (func $remove-set (type $16) (result (ref func))
;; CHECK: (func $remove-set (type $17) (result (ref func))
;; CHECK-NEXT: (local $nn funcref)
;; CHECK-NEXT: (local $i i32)
;; CHECK-NEXT: (loop $loop
Expand Down Expand Up @@ -995,7 +995,7 @@
)
)

;; CHECK: (func $strings (type $17) (param $param (ref string))
;; CHECK: (func $strings (type $18) (param $param (ref string))
;; CHECK-NEXT: (local $s (ref string))
;; CHECK-NEXT: (local.set $s
;; CHECK-NEXT: (string.const "hello, world")
Expand Down Expand Up @@ -1141,4 +1141,29 @@
)
)
)

;; CHECK: (func $get-nonnullable-in-unreachable-tuple (type $19) (result anyref i32)
;; CHECK-NEXT: (local $x ((ref any) i32))
;; CHECK-NEXT: (local.tee $x
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (if
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
(func $get-nonnullable-in-unreachable-tuple (result anyref i32)
;; As $get-nonnullable-in-unreachable but the local is a tuple (so we need to
;; check isDefaultable, and not just isNullable).
(local $x ((ref any) i32))
(local.set $x
(unreachable)
)
(if
(i32.const 1)
(unreachable)
)
(local.get $x)
)
)