Skip to content

[threads] Simplify and generalize reftype writing without GC #6766

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 2 commits into from
Jul 18, 2024
Merged

[threads] Simplify and generalize reftype writing without GC #6766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ea493b
[threads] Simplify and generalize reftype writing without GC
tlively Jul 17, 2024
f9c9b1e
comment
tlively Jul 18, 2024
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 scripts/fuzz_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ def is_git_repo():
'shared-absheaptype.wast',
'type-ssa-shared.wast',
'shared-ref_eq.wast',
'shared-null-no-gc.wast',
'shared-types-no-gc.wast',
]


Expand Down
24 changes: 8 additions & 16 deletions src/wasm/wasm-binary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,23 +1520,15 @@ void WasmBinaryWriter::writeType(Type type) {
// internally use more refined versions of those types, but we cannot emit
// those more refined types.
if (!wasm->features.hasGC()) {
if (Type::isSubType(type, Type(HeapType::func, Nullable))) {
o << S32LEB(BinaryConsts::EncodedType::funcref);
return;
}
if (Type::isSubType(type, Type(HeapType::ext, Nullable))) {
o << S32LEB(BinaryConsts::EncodedType::externref);
return;
}
if (Type::isSubType(type, Type(HeapType::exn, Nullable))) {
o << S32LEB(BinaryConsts::EncodedType::exnref);
return;
}
if (Type::isSubType(type, Type(HeapType::string, Nullable))) {
o << S32LEB(BinaryConsts::EncodedType::stringref);
return;
auto ht = type.getHeapType();
if (ht.isBasic() && ht.getBasic(Unshared) == HeapType::string) {
// Do not overgeneralize stringref to anyref. We have tests that when a
// stringref is expected, we actually get a stringref. If we see a
// string, the stringref feature must be enabled.
type = Type(HeapTypes::string.getBasic(ht.getShared()), Nullable);
} else {
type = Type(type.getHeapType().getTop(), Nullable);
}
WASM_UNREACHABLE("bad type without GC");
}
auto heapType = type.getHeapType();
if (type.isNullable() && heapType.isBasic() && !heapType.isShared()) {
Expand Down
15 changes: 11 additions & 4 deletions test/lit/basic/shared-null-no-gc.wast → test/lit/basic/shared-types-no-gc.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited.

;; Test that we can write a binary without crashing when using a shared bottom
;; type without GC enabled.
;; Test that we can write a binary without crashing when using shared reference
;; types without GC enabled.

;; RUN: wasm-opt %s --enable-reference-types --enable-shared-everything --roundtrip -S -o - | filecheck %s

(module
;; CHECK: (func $test
;; CHECK: (func $null
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.null (shared nofunc))
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $test
(func $null
(drop
(ref.null (shared func))
)
)

;; CHECK: (func $signature (result (ref null (shared func)))
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
(func $signature (result (ref null (shared func)))
(unreachable)
)
)