Skip to content

[MakeSharedObjects] Fix casts of non-func types #9031

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 21, 2026
+28 −4
Merged

[MakeSharedObjects] Fix casts of non-func types #9031

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: 2 additions & 0 deletions src/passes/MakeSharedObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ struct MakeSharedObjects
return;
}
if (!castHeapType.isSignature()) {
updateType(curr->castType);
return;
}
Builder builder(*getModule());
Expand Down Expand Up @@ -224,6 +225,7 @@ struct MakeSharedObjects
return;
}
if (!castHeapType.isSignature()) {
updateType(curr->type);
return;
}
if (getPassOptions().trapsNeverHappen) {
Expand Down
30 changes: 26 additions & 4 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 @@ -616,9 +616,13 @@

;; CHECK: (type $10 (func (result (ref null (shared i31)))))

;; CHECK: (type $11 (func (param (ref null $struct)) (result i32)))
;; CHECK: (type $11 (func (param (ref null (shared any))) (result i32)))

;; CHECK: (type $12 (func (param (ref null $struct)) (result (ref null $struct))))
;; CHECK: (type $12 (func (param (ref null $struct)) (result i32)))

;; CHECK: (type $13 (func (param (ref null (shared any))) (result (ref null (shared i31)))))

;; CHECK: (type $14 (func (param (ref null $struct)) (result (ref null $struct))))

;; CHECK: (table $funcs 0 0 funcref)

Expand Down Expand Up @@ -696,6 +700,15 @@
(ref.test (ref null (shared nofunc)) (local.get 0))
)

;; CHECK: (func $ref-test-i31 (type $11) (param $0 (ref null (shared any))) (result i32)
;; CHECK-NEXT: (ref.test (ref null (shared i31))
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $ref-test-i31 (param (ref null any)) (result i32)
(ref.test (ref null i31) (local.get 0))
)

;; CHECK: (func $ref-test-no-nulls (type $5) (param $0 (ref (shared i31))) (result i32)
;; CHECK-NEXT: (ref.test (ref $shared-sig)
;; CHECK-NEXT: (table.get $funcs
Expand Down Expand Up @@ -900,7 +913,7 @@
)

;; ref.test of non-function type.
;; CHECK: (func $ref-test-non-func (type $11) (param $0 (ref null $struct)) (result i32)
;; CHECK: (func $ref-test-non-func (type $12) (param $0 (ref null $struct)) (result i32)
;; CHECK-NEXT: (ref.test (ref null $struct)
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
Expand Down Expand Up @@ -982,6 +995,15 @@
(ref.cast (ref null (shared nofunc)) (local.get 0))
)

;; CHECK: (func $ref-cast-i31 (type $13) (param $0 (ref null (shared any))) (result (ref null (shared i31)))
;; CHECK-NEXT: (ref.cast (ref null (shared i31))
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $ref-cast-i31 (param (ref null any)) (result (ref null i31))
(ref.cast (ref null i31) (local.get 0))
)

;; CHECK: (func $ref-cast-no-nulls (type $9) (param $0 (ref (shared i31))) (result (ref (shared i31)))
;; CHECK-NEXT: (local $1 (ref (shared i31)))
;; CHECK-NEXT: (if (result (ref (shared i31)))
Expand Down Expand Up @@ -1283,7 +1305,7 @@
(ref.cast (ref null $sig) (unreachable))
)

;; CHECK: (func $ref-cast-non-func (type $12) (param $0 (ref null $struct)) (result (ref null $struct))
;; CHECK: (func $ref-cast-non-func (type $14) (param $0 (ref null $struct)) (result (ref null $struct))
;; CHECK-NEXT: (ref.cast (ref null $struct)
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
Expand Down
Loading