Skip to content

[threads] Shared polymorphism for extern conversions #6730

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

[threads] Shared polymorphism for extern conversions #6730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/wasm/wasm-validator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2222,10 +2222,11 @@ void FunctionValidator::visitRefAs(RefAs* curr) {
if (curr->type == Type::unreachable) {
return;
}
shouldBeSubType(curr->value->type,
Type(HeapType::ext, Nullable),
curr->value,
"any.convert_extern value should be an externref");
shouldBeSubTypeIgnoringShared(
curr->value->type,
Type(HeapType::ext, Nullable),
curr->value,
"any.convert_extern value should be an externref");
break;
}
case ExternConvertAny: {
Expand All @@ -2235,10 +2236,11 @@ void FunctionValidator::visitRefAs(RefAs* curr) {
if (curr->type == Type::unreachable) {
return;
}
shouldBeSubType(curr->value->type,
Type(HeapType::any, Nullable),
curr->value,
"extern.convert_any value should be an anyref");
shouldBeSubTypeIgnoringShared(
curr->value->type,
Type(HeapType::any, Nullable),
curr->value,
"extern.convert_any value should be an anyref");
break;
}
}
Expand Down
9 changes: 6 additions & 3 deletions src/wasm/wasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,15 +1227,18 @@ void RefAs::finalize() {
type = Type::unreachable;
return;
}
auto valHeapType = value->type.getHeapType();
switch (op) {
case RefAsNonNull:
type = Type(value->type.getHeapType(), NonNullable);
type = Type(valHeapType, NonNullable);
break;
case AnyConvertExtern:
type = Type(HeapType::any, value->type.getNullability());
type = Type(HeapTypes::any.getBasic(valHeapType.getShared()),
value->type.getNullability());
break;
case ExternConvertAny:
type = Type(HeapType::ext, value->type.getNullability());
type = Type(HeapTypes::ext.getBasic(valHeapType.getShared()),
value->type.getNullability());
break;
default:
WASM_UNREACHABLE("invalid ref.as_*");
Expand Down
13 changes: 13 additions & 0 deletions test/spec/shared-polymorphism.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,17 @@
(func (param (ref null (shared i31))) (drop (i31.get_u (local.get 0))))

(func (param (ref null (shared array))) (drop (array.len (local.get 0))))

(func (param (ref null (shared extern))) (result (ref null (shared any)))
(any.convert_extern (local.get 0))
)
(func (param (ref (shared extern))) (result (ref (shared any)))
(any.convert_extern (local.get 0))
)
(func (param (ref null (shared any))) (result (ref null (shared extern)))
(extern.convert_any (local.get 0))
)
(func (param (ref (shared any))) (result (ref (shared extern)))
(extern.convert_any (local.get 0))
)
)