Skip to content

Fix ReFinalize in MakeSharedObjects #8974

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
Aug 7, 2026
+21 −1
Merged

Fix ReFinalize in MakeSharedObjects #8974

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
2 changes: 1 addition & 1 deletion src/passes/MakeSharedObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ struct MakeSharedObjects
CallRefCollector collector(callRefTypes);
collector.walk(curr->body);
WalkerPass::walkFunction(curr);
ReFinalize().walkFunctionInModule(curr, getModule());
}

void visitCallRef(CallRef* curr) {
Expand Down Expand Up @@ -325,6 +324,7 @@ struct MakeSharedObjects
void visitModule(Module* wasm) {
rewriteTypes();
addFunctionTable();
ReFinalize().run(getPassRunner(), wasm);
}

void rewriteTypes() {
Expand Down
20 changes: 20 additions & 0 deletions test/lit/passes/make-shared-objects.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,3 +1424,23 @@
;; CHECK: (import "" "" (global $g-sig (ref null (shared i31))))
(import "" "" (global $g-sig (ref null $sig)))
)

(module
;; Struct gets of signature fields must be properly refinalized to shared
;; i31 after rewriteTypes rewrites the struct types to shared.
(type $sig (func))
;; CHECK: (type $struct (shared (struct (field (ref (shared i31))))))
(type $struct (struct (field (ref $sig))))
;; CHECK: (type $1 (func (param (ref $struct)) (result (ref (shared i31)))))

;; CHECK: (func $struct-get (type $1) (param $0 (ref $struct)) (result (ref (shared i31)))
;; CHECK-NEXT: (struct.get $struct 0
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $struct-get (param (ref $struct)) (result (ref $sig))
(struct.get $struct 0
(local.get 0)
)
)
)
Loading