Skip to content

Fix wrong loop variable in processResumeHandlers #8289

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 2 commits into from
Feb 11, 2026
+68 −1
Merged

Fix wrong loop variable in processResumeHandlers #8289

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
a3ee6cb
Fix wrong loop variable in processResumeHandlers
sumleo Feb 11, 2026
2faa67a
retrigger CI
sumleo Feb 11, 2026
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
2 changes: 1 addition & 1 deletion src/ir/subtype-exprs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ struct SubtypingDiscoverer : public OverriddenVisitor<SubType> {
auto expected = self()->findBreakTarget(handlerBlocks[i])->type;
assert(tagSig.params.size() + 1 == expected.size());
for (Index j = 0; j < tagSig.params.size(); ++j) {
self()->noteSubtype(tagSig.params[i], expected[i]);
self()->noteSubtype(tagSig.params[j], expected[j]);
}
auto nextSig = expected[expected.size() - 1]
.getHeapType()
Expand Down
67 changes: 67 additions & 0 deletions test/lit/passes/unsubtyping-stack-switching.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,3 +524,70 @@
)
)

;; Test that processResumeHandlers correctly iterates handler tag parameters
;; using the inner loop variable. With two handlers where handler 1 has multiple
;; parameters, the subtyping constraint at param index 0 of handler 1 must be
;; noted (not the constraint at param index 1 repeated).
(module
;; CHECK: (rec
;; CHECK-NEXT: (type $super (sub (struct)))
(type $super (sub (struct)))
;; CHECK: (type $sub (sub $super (struct)))
(type $sub (sub $super (struct)))

;; CHECK: (type $f (func))
(type $f (func))
;; CHECK: (type $cont (cont $f))
(type $cont (cont $f))

;; First tag has 1 param; second tag has 2 params with $sub at index 0.
;; CHECK: (type $4 (func (param i32)))

;; CHECK: (type $5 (func (param (ref null $sub) i32)))

;; CHECK: (type $6 (func (result (ref null $super) i32 (ref null $cont))))

;; CHECK: (type $7 (func (result i32 (ref null $cont))))

;; CHECK: (tag $e0 (type $4) (param i32))
(tag $e0 (param i32))
;; CHECK: (tag $e1 (type $5) (param (ref null $sub) i32))
(tag $e1 (param (ref null $sub) i32))

;; CHECK: (func $resume-handler-multi-param (type $f)
;; CHECK-NEXT: (local $c (ref null $cont))
;; CHECK-NEXT: (tuple.drop 2
;; CHECK-NEXT: (block $l0 (type $7) (result i32 (ref null $cont))
;; CHECK-NEXT: (tuple.drop 3
;; CHECK-NEXT: (block $l1 (type $6) (result (ref null $super) i32 (ref null $cont))
;; CHECK-NEXT: (resume $cont (on $e0 $l0) (on $e1 $l1)
;; CHECK-NEXT: (local.get $c)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $resume-handler-multi-param
(local $c (ref null $cont))
(tuple.drop 2
(block $l0 (result i32 (ref null $cont))
(tuple.drop 3
(block $l1 (result (ref null $super) i32 (ref null $cont))
;; Handler 1 sends (ref null $sub, i32) to $l1 which expects
;; (ref null $super, i32, ref null $cont). This requires
;; $sub <: $super at param index 0 of handler 1.
(resume $cont (on $e0 $l0) (on $e1 $l1)
(local.get $c)
)
(unreachable)
)
)
(unreachable)
)
)
)
)

Loading