diff --git a/src/passes/LegalizeJSInterface.cpp b/src/passes/LegalizeJSInterface.cpp index 327d28d76a4..4509f280b23 100644 --- a/src/passes/LegalizeJSInterface.cpp +++ b/src/passes/LegalizeJSInterface.cpp @@ -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(); } } diff --git a/test/lit/passes/legalize-and-prune-js-interface.wast b/test/lit/passes/legalize-and-prune-js-interface.wast index 0840ddbdd57..01b89d42912 100644 --- a/test/lit/passes/legalize-and-prune-js-interface.wast +++ b/test/lit/passes/legalize-and-prune-js-interface.wast @@ -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))) @@ -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) @@ -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) @@ -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