Skip to content

Fix TypeMapper::getNewHeapType() on types being rebuilt #8499

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

Open
kripken wants to merge 2 commits into
base: main
Choose a base branch
from
+38 −1
Open

Fix TypeMapper::getNewHeapType() on types being rebuilt #8499

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
989ee9b
fix
kripken Mar 19, 2026
dfb13ea
improve test
kripken Mar 19, 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/type-updating.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ class TypeMapper : public GlobalTypeRewriter {
HeapType getNewHeapType(HeapType type) {
auto iter = mapping.find(type);
if (iter != mapping.end()) {
return iter->second;
type = iter->second;
}
return getTempHeapType(type);
}
Expand Down
37 changes: 37 additions & 0 deletions test/lit/passes/type-merging-cont.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,40 @@
)
)

;; A chain of continuations. During merging here we map types that are being
;; rebuilt, and should not error while doing so. We can merge the function
;; types, and all but two of the continuations.
(module
(rec
;; CHECK: (rec
;; CHECK-NEXT: (type $func (sub (func)))
(type $func (sub (func)))
;; CHECK: (type $cont (sub (cont $func)))
(type $cont (sub (cont $func)))
(type $contB (sub $cont (cont $func)))
(type $contC (sub $contB (cont $func)))
(type $funcB (sub $func (func)))
;; CHECK: (type $contD (sub final $cont (cont $func)))
(type $contD (sub final $contC (cont $funcB)))
)

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

;; CHECK: (func $uses (type $3)
;; CHECK-NEXT: (local $func (ref $func))
;; CHECK-NEXT: (local $funcB (ref $func))
;; CHECK-NEXT: (local $cont (ref $cont))
;; CHECK-NEXT: (local $contB (ref $cont))
;; CHECK-NEXT: (local $contC (ref $cont))
;; CHECK-NEXT: (local $contD (ref $contD))
;; CHECK-NEXT: )
(func $uses
(local $func (ref $func))
(local $funcB (ref $funcB))
(local $cont (ref $cont))
(local $contB (ref $contB))
(local $contC (ref $contC))
(local $contD (ref $contD))
)
)

Loading