Skip to content

Remove incorrect assertion in IRBuilder #8177

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
tlively merged 1 commit into from
Jan 6, 2026
+61 −2
Merged

Remove incorrect assertion in IRBuilder #8177

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
1 change: 0 additions & 1 deletion src/wasm/wasm-ir-builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,6 @@ IRBuilder::fixExtraOutput(ScopeCtx& scope, Name label, Expression* curr) {

// If all the received values are in the scratch local, just fetch them out.
if (receivedType == Type::none) {
assert(extraType == labelType);
curr = builder.makeSequence(
curr, builder.makeLocalGet(extraLocal, extraType), extraType);
continue;
Expand Down
62 changes: 61 additions & 1 deletion test/lit/wat-kitchen-sink.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5139,7 +5139,7 @@
)

;; The if is unreachable except through the break; make sure this is
;; parse correctly
;; parsed correctly
;; CHECK: (func $if-else-br-return (type $27) (param $a i32) (result i32)
;; CHECK-NEXT: (block $label
;; CHECK-NEXT: (if
Expand Down Expand Up @@ -5168,6 +5168,66 @@
(i32.const 1)
)

;; CHECK: (func $if-else-unreachable-br-extra (type $1) (result i32)
;; CHECK-NEXT: (local $scratch nullref)
;; CHECK-NEXT: (local $scratch_1 i32)
;; CHECK-NEXT: (local $scratch_2 i32)
;; CHECK-NEXT: (local $scratch_3 (ref none))
;; CHECK-NEXT: (local $scratch_4 i32)
;; CHECK-NEXT: (block $l (result i32)
;; CHECK-NEXT: (block $l0
;; CHECK-NEXT: (br $l
;; CHECK-NEXT: (if (result i32)
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: (then
;; CHECK-NEXT: (local.set $scratch_1
;; CHECK-NEXT: (block (result i32)
;; CHECK-NEXT: (local.set $scratch_2
;; CHECK-NEXT: (i32.const 42)
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $scratch
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.get $scratch_2)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $scratch_3
;; CHECK-NEXT: (br_on_null $l0
;; CHECK-NEXT: (local.get $scratch)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $scratch_4
;; CHECK-NEXT: (local.get $scratch_1)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $scratch_3)
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.get $scratch_4)
;; CHECK-NEXT: )
;; CHECK-NEXT: (else
;; CHECK-NEXT: (i32.const 1337)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.get $scratch_1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $if-else-unreachable-br-extra (result i32)
;; The condition is unreachable, making the if unreachable.
unreachable
if $l (result i32)
;; Send an extra i32. We should not get confused because the if is
;; unreachable.
i32.const 42
ref.null none
br_on_null $l
drop
else $l
i32.const 1337
end $l
)

;; CHECK: (func $try-br-catch-all-return (type $0)
;; CHECK-NEXT: (block $label
;; CHECK-NEXT: (try
Expand Down
Loading