Skip to content

[GUFA] Fix crash on switch handlers #9110

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
Sep 16, 2026
+65 −1
Merged

[GUFA] Fix crash on switch handlers #9110

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
6 changes: 5 additions & 1 deletion src/ir/possible-contents.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,8 +1411,12 @@ struct InfoCollector
// continuation values.
auto numTags = curr->handlerTags.size();
for (Index tagIndex = 0; tagIndex < numTags; tagIndex++) {
auto tag = curr->handlerTags[tagIndex];
auto target = curr->handlerBlocks[tagIndex];
if (!target) {
// A switch handler does not branch to a target block.
continue;
}
auto tag = curr->handlerTags[tagIndex];
auto params = getModule()->getTag(tag)->params();

// Add the values from the tag.
Expand Down
60 changes: 60 additions & 0 deletions test/lit/passes/gufa-cont.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@

;; CHECK: (export "resume-i32" (func $resume-i32))

;; CHECK: (export "resume-switch" (func $resume-switch))

;; CHECK: (export "resume_throw-switch" (func $resume_throw-switch))

;; CHECK: (func $cont (type $func)
;; CHECK-NEXT: (suspend $tag)
;; CHECK-NEXT: )
Expand All @@ -53,6 +57,10 @@

;; OPEN_WORLD: (export "resume-i32" (func $resume-i32))

;; OPEN_WORLD: (export "resume-switch" (func $resume-switch))

;; OPEN_WORLD: (export "resume_throw-switch" (func $resume_throw-switch))

;; OPEN_WORLD: (func $cont (type $func)
;; OPEN_WORLD-NEXT: (suspend $tag)
;; OPEN_WORLD-NEXT: )
Expand Down Expand Up @@ -195,6 +203,58 @@
)
)
)

;; CHECK: (func $resume-switch (type $func)
;; CHECK-NEXT: (resume $cont (on $tag switch)
;; CHECK-NEXT: (cont.new $cont
;; CHECK-NEXT: (ref.func $cont)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPEN_WORLD: (func $resume-switch (type $func)
;; OPEN_WORLD-NEXT: (resume $cont (on $tag switch)
;; OPEN_WORLD-NEXT: (cont.new $cont
;; OPEN_WORLD-NEXT: (ref.func $cont)
;; OPEN_WORLD-NEXT: )
;; OPEN_WORLD-NEXT: )
;; OPEN_WORLD-NEXT: )
(func $resume-switch (export "resume-switch")
;; Switch handlers do not branch to a target block. Ensure GUFA does not
;; attempt to look up a target block name (which would incorrectly find an
;; unnamed block in scope or null) and crash.
(block
(resume $cont (on $tag switch)
(cont.new $cont
(ref.func $cont)
)
)
)
)

;; CHECK: (func $resume_throw-switch (type $func)
;; CHECK-NEXT: (resume_throw $cont $tag (on $tag switch)
;; CHECK-NEXT: (cont.new $cont
;; CHECK-NEXT: (ref.func $cont)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPEN_WORLD: (func $resume_throw-switch (type $func)
;; OPEN_WORLD-NEXT: (resume_throw $cont $tag (on $tag switch)
;; OPEN_WORLD-NEXT: (cont.new $cont
;; OPEN_WORLD-NEXT: (ref.func $cont)
;; OPEN_WORLD-NEXT: )
;; OPEN_WORLD-NEXT: )
;; OPEN_WORLD-NEXT: )
(func $resume_throw-switch (export "resume_throw-switch")
;; As above, but with resume_throw.
(block
(resume_throw $cont $tag (on $tag switch)
(cont.new $cont
(ref.func $cont)
)
)
)
)
)

(module
Expand Down
Loading