Skip to content

Fix shareability of externalized nulls #6791

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 1 commit into from
Jul 30, 2024
Merged

Fix shareability of externalized nulls #6791

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
5 changes: 3 additions & 2 deletions src/wasm/literal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2687,11 +2687,12 @@ Literal Literal::relaxedFmsF64x2(const Literal& left,
Literal Literal::externalize() const {
assert(type.isRef() && type.getHeapType().getUnsharedTop() == HeapType::any &&
"can only externalize internal references");
auto share = type.getHeapType().getShared();
if (isNull()) {
return Literal(std::shared_ptr<GCData>{}, HeapType::noext);
return Literal(std::shared_ptr<GCData>{}, HeapTypes::noext.getBasic(share));
}
auto heapType = type.getHeapType();
auto extType = HeapTypes::ext.getBasic(heapType.getShared());
auto extType = HeapTypes::ext.getBasic(share);
if (heapType.isMaybeShared(HeapType::i31)) {
return Literal(std::make_shared<GCData>(heapType, Literals{*this}),
extType);
Expand Down
8 changes: 8 additions & 0 deletions test/spec/convert_extern.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@
(ref.null (shared noextern))
)
)

(func $shared-null-rev (export "shared-null-rev") (result (ref null (shared extern)))
;; As before, but the reverse conversion.
(extern.convert_any
(ref.null (shared any))
)
)
)

(assert_return (invoke "shared-null") (ref.null (shared any)))
(assert_return (invoke "shared-null-rev") (ref.null (shared extern)))