Skip to content

[gc] Subtyping fix #4075

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 3 commits into from
Feb 17, 2025
Merged

[gc] Subtyping fix #4075

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef4bbc0
Subtyping fix
vouillon Feb 9, 2025
c2db446
Typo
vouillon Feb 9, 2025
302dcb6
Format
vouillon Feb 12, 2025
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
23 changes: 14 additions & 9 deletions core/iwasm/common/gc/gc_type.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,15 @@ wasm_reftype_is_subtype_of(uint8 type1, const WASMRefType *ref_type1,
return true;
else {
int32 heap_type = ref_type1->ref_ht_common.heap_type;
// We dont care whether type2 is nullable or not. So
// we normalize it into its related one-byte type.
if (type2 == REF_TYPE_HT_NULLABLE
|| type2 == REF_TYPE_HT_NON_NULLABLE) {
bh_assert(ref_type2);
type2 =
(uint8)(ref_type2->ref_ht_common.heap_type
+ REF_TYPE_FUNCREF - HEAP_TYPE_FUNC);
}
if (heap_type == HEAP_TYPE_ANY) {
/* (ref any) <: anyref */
return type2 == REF_TYPE_ANYREF ? true : false;
Expand Down Expand Up @@ -1188,19 +1197,15 @@ wasm_reftype_is_subtype_of(uint8 type1, const WASMRefType *ref_type1,
}
#endif
else if (heap_type == HEAP_TYPE_NONE) {
/* (ref none) */
/* TODO */
bh_assert(0);
return wasm_is_reftype_supers_of_none(type2, NULL, types,
type_count);
}
else if (heap_type == HEAP_TYPE_NOEXTERN) {
/* (ref noextern) */
/* TODO */
bh_assert(0);
return wasm_is_reftype_supers_of_noextern(type2);
}
else if (heap_type == HEAP_TYPE_NOFUNC) {
/* (ref nofunc) */
/* TODO */
bh_assert(0);
return wasm_is_reftype_supers_of_nofunc(type2, NULL, types,
type_count);
}
else {
bh_assert(0);
Expand Down
2 changes: 1 addition & 1 deletion core/iwasm/interpreter/wasm_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ type2str(uint8 type)
"", /* reserved */
"arrayref",
"structref",
"i32ref",
"i31ref",
"eqref",
"anyref",
"externref",
Expand Down
Loading