Skip to content

LegalizeAndPruneJSInterface: Handle non-nullable results #7944

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 2 commits into from
Oct 3, 2025
Merged

LegalizeAndPruneJSInterface: Handle non-nullable results #7944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e75c16
FIX.prune
kripken Oct 3, 2025
9d738a4
typo
kripken Oct 3, 2025
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
5 changes: 4 additions & 1 deletion src/passes/LegalizeJSInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,9 +391,12 @@ struct LegalizeAndPruneJSInterface : public LegalizeJSInterface {
Builder builder(*module);
if (sig.results == Type::none) {
func->body = builder.makeNop();
} else {
} else if (sig.results.isDefaultable()) {
func->body =
builder.makeConstantExpression(Literal::makeZeros(sig.results));
} else {
// We have nothing better than to trap here.
func->body = builder.makeUnreachable();
}
}

Expand Down
38 changes: 30 additions & 8 deletions test/lit/passes/legalize-and-prune-js-interface.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@

(import "env" "imported-v128-param-noresult" (func $imported-v128-param-noresult (param v128)))

;; The results here include a nullable value, which we will emit a null for.
(import "env" "imported-v128-defaultable" (func $imported-v128-defaultable (result v128 anyref)))

;; The results here include a non-nullable value, which will force us to emit
;; an unreachable.
(import "env" "imported-v128-nondefaultable" (func $imported-v128-nondefaultable (result v128 (ref any))))

;; CHECK: (type $0 (func (result v128)))

;; CHECK: (type $1 (func (result i32 f64)))
Expand All @@ -22,17 +29,21 @@

;; CHECK: (type $3 (func (param v128)))

;; CHECK: (type $4 (func))
;; CHECK: (type $4 (func (result v128 anyref)))

;; CHECK: (type $5 (func (result v128 (ref any))))

;; CHECK: (type $5 (func (result i32)))
;; CHECK: (type $6 (func))

;; CHECK: (type $6 (func (param i32 f64) (result i64)))
;; CHECK: (type $7 (func (result i32)))

;; CHECK: (type $7 (func (param i32 f64) (result i32)))
;; CHECK: (type $8 (func (param i32 f64) (result i64)))

;; CHECK: (import "env" "getTempRet0" (func $getTempRet0 (type $5) (result i32)))
;; CHECK: (type $9 (func (param i32 f64) (result i32)))

;; CHECK: (import "env" "imported-64" (func $legalimport$imported-64 (type $7) (param i32 f64) (result i32)))
;; CHECK: (import "env" "getTempRet0" (func $getTempRet0 (type $7) (result i32)))

;; CHECK: (import "env" "imported-64" (func $legalimport$imported-64 (type $9) (param i32 f64) (result i32)))

;; CHECK: (func $imported-v128 (type $0) (result v128)
;; CHECK-NEXT: (v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000)
Expand All @@ -53,7 +64,18 @@
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )

;; CHECK: (func $call-64 (type $4)
;; CHECK: (func $imported-v128-defaultable (type $4) (result v128 anyref)
;; CHECK-NEXT: (tuple.make 2
;; CHECK-NEXT: (v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000)
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: )
;; CHECK-NEXT: )

;; CHECK: (func $imported-v128-nondefaultable (type $5) (result v128 (ref any))
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )

;; CHECK: (func $call-64 (type $6)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (call $legalfunc$imported-64
;; CHECK-NEXT: (i32.const 0)
Expand Down Expand Up @@ -103,7 +125,7 @@
)
)

;; CHECK: (func $legalfunc$imported-64 (type $6) (param $0 i32) (param $1 f64) (result i64)
;; CHECK: (func $legalfunc$imported-64 (type $8) (param $0 i32) (param $1 f64) (result i64)
;; CHECK-NEXT: (i64.or
;; CHECK-NEXT: (i64.extend_i32_u
;; CHECK-NEXT: (call $legalimport$imported-64
Expand Down
Loading