Skip to content

Do not double count control flow types #8196

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 9 commits into from
Jan 15, 2026
+411 −412
Merged

Do not double count control flow types #8196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e46b802
Do not recollect types in ReorderTypes
tlively Jan 13, 2026
c9470db
[NFC] Minor improvements around type collection
tlively Jan 13, 2026
04937d4
remove unnecessary using
tlively Jan 14, 2026
5030996
Merge branch 'reorder-types-fix' into type-collection-minor-fixes
tlively Jan 14, 2026
ac8bab2
improve
tlively Jan 14, 2026
c69066f
update tests
tlively Jan 14, 2026
b302b8f
Merge branch 'main' into reorder-types-fix
tlively Jan 14, 2026
00e2a56
Merge branch 'reorder-types-fix' into type-collection-minor-fixes
tlively Jan 14, 2026
f9dcc92
Merge branch 'main' into type-collection-minor-fixes
tlively Jan 14, 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
4 changes: 2 additions & 2 deletions src/ir/module-utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,8 @@ InsertOrderedMap<HeapType, HeapTypeInfo> collectHeapTypeInfo(

// We've found all the types there are to find without considering more
// control flow types. Consider one more control flow type and repeat.
for (; controlFlowIt != info.controlFlowSignatures.end(); ++controlFlowIt) {
auto& [sig, count] = *controlFlowIt;
while (controlFlowIt != info.controlFlowSignatures.end()) {
auto& [sig, count] = *controlFlowIt++;
if (auto it = seenSigs.find(sig); it != seenSigs.end()) {
info.info[it->second].useCount += count;
} else {
Expand Down
3 changes: 1 addition & 2 deletions src/ir/type-updating.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ void GlobalTypeRewriter::update() {

GlobalTypeRewriter::PredecessorGraph
GlobalTypeRewriter::getPrivatePredecessors() {
// Check if a type is private, looking for its info (if there is none, it is
// not private).
// Check if a type is private based on its collected info.
auto isPublic = [&](HeapType type) {
auto it = typeInfo.find(type);
assert(it != typeInfo.end());
Expand Down
132 changes: 66 additions & 66 deletions test/lit/basic/exception-handling.wast
View file
Open in desktop

Large diffs are not rendered by default.

188 changes: 94 additions & 94 deletions test/lit/basic/extra-branch-values.wast
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions test/lit/basic/stack_switching_resume.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
;; CHECK-BINARY: (type $3 (func (param (ref $ct)) (result i32)))

;; CHECK-BINARY: (tag $t (result i32))
;; CHECK-TEXT: (type $2 (func (result i32 (ref $ct))))
;; CHECK-TEXT: (type $2 (func (param (ref $ct)) (result i32)))

;; CHECK-TEXT: (type $3 (func (param (ref $ct)) (result i32)))
;; CHECK-TEXT: (type $3 (func (result i32 (ref $ct))))

;; CHECK-TEXT: (tag $t (type $ft) (param i32) (result i32))
;; CHECK-BIN: (type $2 (func (result i32 (ref $ct))))
;; CHECK-BIN: (type $2 (func (param (ref $ct)) (result i32)))

;; CHECK-BIN: (type $3 (func (param (ref $ct)) (result i32)))
;; CHECK-BIN: (type $3 (func (result i32 (ref $ct))))

;; CHECK-BIN: (tag $t (type $ft) (param i32) (result i32))
(tag $t (param i32) (result i32))
Expand All @@ -48,9 +48,9 @@
;; CHECK-BINARY-NEXT: )
;; CHECK-BINARY-NEXT: (i32.const 123)
;; CHECK-BINARY-NEXT: )
;; CHECK-TEXT: (func $go (type $3) (param $x (ref $ct)) (result i32)
;; CHECK-TEXT: (func $go (type $2) (param $x (ref $ct)) (result i32)
;; CHECK-TEXT-NEXT: (tuple.extract 2 0
;; CHECK-TEXT-NEXT: (block $handler (type $2) (result i32 (ref $ct))
;; CHECK-TEXT-NEXT: (block $handler (type $3) (result i32 (ref $ct))
;; CHECK-TEXT-NEXT: (return
;; CHECK-TEXT-NEXT: (resume $ct (on $t $handler)
;; CHECK-TEXT-NEXT: (i32.const 123)
Expand All @@ -60,13 +60,13 @@
;; CHECK-TEXT-NEXT: )
;; CHECK-TEXT-NEXT: )
;; CHECK-TEXT-NEXT: )
;; CHECK-BIN: (func $go (type $3) (param $x (ref $ct)) (result i32)
;; CHECK-BIN: (func $go (type $2) (param $x (ref $ct)) (result i32)
;; CHECK-BIN-NEXT: (local $scratch (tuple i32 (ref $ct)))
;; CHECK-BIN-NEXT: (local $scratch_2 i32)
;; CHECK-BIN-NEXT: (local.set $scratch_2
;; CHECK-BIN-NEXT: (tuple.extract 2 0
;; CHECK-BIN-NEXT: (local.tee $scratch
;; CHECK-BIN-NEXT: (block $block (type $2) (result i32 (ref $ct))
;; CHECK-BIN-NEXT: (block $block (type $3) (result i32 (ref $ct))
;; CHECK-BIN-NEXT: (return
;; CHECK-BIN-NEXT: (resume $ct (on $t $block)
;; CHECK-BIN-NEXT: (i32.const 123)
Expand Down Expand Up @@ -125,19 +125,19 @@

;; CHECK-BIN-NODEBUG: (type $1 (cont $0))

;; CHECK-BIN-NODEBUG: (type $2 (func (result i32 (ref $1))))
;; CHECK-BIN-NODEBUG: (type $2 (func (param (ref $1)) (result i32)))

;; CHECK-BIN-NODEBUG: (type $3 (func (param (ref $1)) (result i32)))
;; CHECK-BIN-NODEBUG: (type $3 (func (result i32 (ref $1))))

;; CHECK-BIN-NODEBUG: (tag $tag$0 (type $0) (param i32) (result i32))

;; CHECK-BIN-NODEBUG: (func $0 (type $3) (param $0 (ref $1)) (result i32)
;; CHECK-BIN-NODEBUG: (func $0 (type $2) (param $0 (ref $1)) (result i32)
;; CHECK-BIN-NODEBUG-NEXT: (local $scratch (tuple i32 (ref $1)))
;; CHECK-BIN-NODEBUG-NEXT: (local $scratch_2 i32)
;; CHECK-BIN-NODEBUG-NEXT: (local.set $scratch_2
;; CHECK-BIN-NODEBUG-NEXT: (tuple.extract 2 0
;; CHECK-BIN-NODEBUG-NEXT: (local.tee $scratch
;; CHECK-BIN-NODEBUG-NEXT: (block $block (type $2) (result i32 (ref $1))
;; CHECK-BIN-NODEBUG-NEXT: (block $block (type $3) (result i32 (ref $1))
;; CHECK-BIN-NODEBUG-NEXT: (return
;; CHECK-BIN-NODEBUG-NEXT: (resume $1 (on $tag$0 $block)
;; CHECK-BIN-NODEBUG-NEXT: (i32.const 123)
Expand Down
48 changes: 24 additions & 24 deletions test/lit/basic/stack_switching_resume_throw.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,32 @@
;; CHECK-BIN: (type $ct (cont $ft))
(type $ct (cont $ft))

;; CHECK-TEXT: (type $2 (func (result i32 (ref $ct))))
;; CHECK-TEXT: (type $2 (func (param i64)))

;; CHECK-TEXT: (type $3 (func (param i64)))
;; CHECK-TEXT: (type $3 (func (param (ref $ct)) (result i32)))

;; CHECK-TEXT: (type $4 (func (param (ref $ct)) (result i32)))
;; CHECK-TEXT: (type $4 (func (result i32)))

;; CHECK-TEXT: (type $5 (func (result i32)))
;; CHECK-TEXT: (type $5 (func (result i32 (ref $ct))))

;; CHECK-TEXT: (tag $t (type $ft) (param i32) (result i32))
;; CHECK-BIN: (type $2 (func (result i32 (ref $ct))))
;; CHECK-BIN: (type $2 (func (param i64)))

;; CHECK-BIN: (type $3 (func (param i64)))
;; CHECK-BIN: (type $3 (func (param (ref $ct)) (result i32)))

;; CHECK-BIN: (type $4 (func (param (ref $ct)) (result i32)))
;; CHECK-BIN: (type $4 (func (result i32)))

;; CHECK-BIN: (type $5 (func (result i32)))
;; CHECK-BIN: (type $5 (func (result i32 (ref $ct))))

;; CHECK-BIN: (tag $t (type $ft) (param i32) (result i32))
(tag $t (param i32) (result i32))
;; CHECK-TEXT: (tag $e (type $3) (param i64))
;; CHECK-BIN: (tag $e (type $3) (param i64))
;; CHECK-TEXT: (tag $e (type $2) (param i64))
;; CHECK-BIN: (tag $e (type $2) (param i64))
(tag $e (param i64))

;; CHECK-TEXT: (func $go (type $4) (param $x (ref $ct)) (result i32)
;; CHECK-TEXT: (func $go (type $3) (param $x (ref $ct)) (result i32)
;; CHECK-TEXT-NEXT: (tuple.extract 2 0
;; CHECK-TEXT-NEXT: (block $handler (type $2) (result i32 (ref $ct))
;; CHECK-TEXT-NEXT: (block $handler (type $5) (result i32 (ref $ct))
;; CHECK-TEXT-NEXT: (return
;; CHECK-TEXT-NEXT: (resume_throw $ct $e (on $t $handler)
;; CHECK-TEXT-NEXT: (i64.const 123)
Expand All @@ -52,13 +52,13 @@
;; CHECK-TEXT-NEXT: )
;; CHECK-TEXT-NEXT: )
;; CHECK-TEXT-NEXT: )
;; CHECK-BIN: (func $go (type $4) (param $x (ref $ct)) (result i32)
;; CHECK-BIN: (func $go (type $3) (param $x (ref $ct)) (result i32)
;; CHECK-BIN-NEXT: (local $scratch (tuple i32 (ref $ct)))
;; CHECK-BIN-NEXT: (local $scratch_2 i32)
;; CHECK-BIN-NEXT: (local.set $scratch_2
;; CHECK-BIN-NEXT: (tuple.extract 2 0
;; CHECK-BIN-NEXT: (local.tee $scratch
;; CHECK-BIN-NEXT: (block $block (type $2) (result i32 (ref $ct))
;; CHECK-BIN-NEXT: (block $block (type $5) (result i32 (ref $ct))
;; CHECK-BIN-NEXT: (return
;; CHECK-BIN-NEXT: (resume_throw $ct $e (on $t $block)
;; CHECK-BIN-NEXT: (i64.const 123)
Expand Down Expand Up @@ -90,7 +90,7 @@
)
)

;; CHECK-TEXT: (func $unreachable (type $5) (result i32)
;; CHECK-TEXT: (func $unreachable (type $4) (result i32)
;; CHECK-TEXT-NEXT: (block ;; (replaces unreachable ResumeThrow we can't emit)
;; CHECK-TEXT-NEXT: (drop
;; CHECK-TEXT-NEXT: (i64.const 123)
Expand All @@ -101,7 +101,7 @@
;; CHECK-TEXT-NEXT: (unreachable)
;; CHECK-TEXT-NEXT: )
;; CHECK-TEXT-NEXT: )
;; CHECK-BIN: (func $unreachable (type $5) (result i32)
;; CHECK-BIN: (func $unreachable (type $4) (result i32)
;; CHECK-BIN-NEXT: (drop
;; CHECK-BIN-NEXT: (i64.const 123)
;; CHECK-BIN-NEXT: )
Expand All @@ -118,25 +118,25 @@

;; CHECK-BIN-NODEBUG: (type $1 (cont $0))

;; CHECK-BIN-NODEBUG: (type $2 (func (result i32 (ref $1))))
;; CHECK-BIN-NODEBUG: (type $2 (func (param i64)))

;; CHECK-BIN-NODEBUG: (type $3 (func (param i64)))
;; CHECK-BIN-NODEBUG: (type $3 (func (param (ref $1)) (result i32)))

;; CHECK-BIN-NODEBUG: (type $4 (func (param (ref $1)) (result i32)))
;; CHECK-BIN-NODEBUG: (type $4 (func (result i32)))

;; CHECK-BIN-NODEBUG: (type $5 (func (result i32)))
;; CHECK-BIN-NODEBUG: (type $5 (func (result i32 (ref $1))))

;; CHECK-BIN-NODEBUG: (tag $tag$0 (type $0) (param i32) (result i32))

;; CHECK-BIN-NODEBUG: (tag $tag$1 (type $3) (param i64))
;; CHECK-BIN-NODEBUG: (tag $tag$1 (type $2) (param i64))

;; CHECK-BIN-NODEBUG: (func $0 (type $4) (param $0 (ref $1)) (result i32)
;; CHECK-BIN-NODEBUG: (func $0 (type $3) (param $0 (ref $1)) (result i32)
;; CHECK-BIN-NODEBUG-NEXT: (local $scratch (tuple i32 (ref $1)))
;; CHECK-BIN-NODEBUG-NEXT: (local $scratch_2 i32)
;; CHECK-BIN-NODEBUG-NEXT: (local.set $scratch_2
;; CHECK-BIN-NODEBUG-NEXT: (tuple.extract 2 0
;; CHECK-BIN-NODEBUG-NEXT: (local.tee $scratch
;; CHECK-BIN-NODEBUG-NEXT: (block $block (type $2) (result i32 (ref $1))
;; CHECK-BIN-NODEBUG-NEXT: (block $block (type $5) (result i32 (ref $1))
;; CHECK-BIN-NODEBUG-NEXT: (return
;; CHECK-BIN-NODEBUG-NEXT: (resume_throw $1 $tag$1 (on $tag$0 $block)
;; CHECK-BIN-NODEBUG-NEXT: (i64.const 123)
Expand All @@ -155,7 +155,7 @@
;; CHECK-BIN-NODEBUG-NEXT: (local.get $scratch_2)
;; CHECK-BIN-NODEBUG-NEXT: )

;; CHECK-BIN-NODEBUG: (func $1 (type $5) (result i32)
;; CHECK-BIN-NODEBUG: (func $1 (type $4) (result i32)
;; CHECK-BIN-NODEBUG-NEXT: (drop
;; CHECK-BIN-NODEBUG-NEXT: (i64.const 123)
;; CHECK-BIN-NODEBUG-NEXT: )
Expand Down
Loading
Loading