Skip to content

[GC] Directize: Fix subtyping #7960

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
kripken merged 4 commits into from
Oct 9, 2025
Merged

[GC] Directize: Fix subtyping #7960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3911ab
fix
kripken Oct 9, 2025
7b23f0a
Merge remote-tracking branch 'origin/main' into directize.sub
kripken Oct 9, 2025
d154964
test the reverse
kripken Oct 9, 2025
a29b0cc
Merge remote-tracking branch 'origin/main' into directize.sub
kripken Oct 9, 2025
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/passes/Directize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ struct FunctionDirectizer : public WalkerPass<PostWalker<FunctionDirectizer>> {
return CallUtils::Trap{};
}
auto* func = getModule()->getFunction(name);
if (original->heapType != func->type) {
if (!HeapType::isSubType(func->type, original->heapType)) {
return CallUtils::Trap{};
}
return CallUtils::Known{name};
Expand Down
114 changes: 114 additions & 0 deletions test/lit/passes/directize-gc.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
;; NOTE: This test was ported using port_passes_tests_to_lit.py and could be cleaned up.

;; RUN: foreach %s %t wasm-opt --directize -all -S -o - | filecheck %s

;; Call a subtype with the supertype. This call should succeed.
(module
(rec
;; CHECK: (type $0 (func))

;; CHECK: (rec
;; CHECK-NEXT: (type $super (sub (func)))
(type $super (sub (func)))
;; CHECK: (type $sub (sub final $super (func)))
(type $sub (sub final $super (func)))
)

;; CHECK: (table $table 93 funcref)
(table $table 93 funcref)

;; CHECK: (elem $elem (i32.const 0) $target)
(elem $elem (i32.const 0) $target)

;; CHECK: (export "caller" (func $caller))

;; CHECK: (func $caller (type $0)
;; CHECK-NEXT: (call $target)
;; CHECK-NEXT: )
(func $caller (export "caller")
;; This turns into a direct call.
(call_indirect (type $super)
(i32.const 0)
)
)

;; CHECK: (func $target (type $sub)
;; CHECK-NEXT: )
(func $target (type $sub)
)
)

;; Remove the subtyping. This call should error.
Copy link
Copy Markdown
Member

@tlively tlively Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be interesting to test the case where the called function is a strict supertype of the expected type as well.

(module
(rec
;; CHECK: (type $0 (func))

;; CHECK: (rec
;; CHECK-NEXT: (type $super (sub (func)))
(type $super (sub (func)))
;; CHECK: (type $other (sub (func)))
(type $other (sub (func)))
)

;; CHECK: (table $table 93 funcref)
(table $table 93 funcref)

;; CHECK: (elem $elem (i32.const 0) $target)
(elem $elem (i32.const 0) $target)

;; CHECK: (export "caller" (func $caller))

;; CHECK: (func $caller (type $0)
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
(func $caller (export "caller")
;; This turns into an unreachable.
(call_indirect (type $super)
(i32.const 0)
)
)

;; CHECK: (func $target (type $other)
;; CHECK-NEXT: )
(func $target (type $other)
)
)

;; Reverse the subtyping: Call a supertype with a subtype. This call should
;; fail.
(module
(rec
;; CHECK: (type $0 (func))

;; CHECK: (rec
;; CHECK-NEXT: (type $super (sub (func)))
(type $super (sub (func)))
;; CHECK: (type $sub (sub final $super (func)))
(type $sub (sub final $super (func)))
)

;; CHECK: (table $table 93 funcref)
(table $table 93 funcref)

;; CHECK: (elem $elem (i32.const 0) $target)
(elem $elem (i32.const 0) $target)

;; CHECK: (export "caller" (func $caller))

;; CHECK: (func $caller (type $0)
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
(func $caller (export "caller")
;; This turns into a direct call.
(call_indirect (type $sub)
(i32.const 0)
)
)

;; CHECK: (func $target (type $super)
;; CHECK-NEXT: )
(func $target (type $super)
)
)

Loading