Skip to content
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

Check whether related table has funcref elem in opcode call_indirect #3999

Merged
merged 5 commits into from
Jan 6, 2025
+50 −0
Merged

Check whether related table has funcref elem in opcode call_indirect #3999

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3ef47c
check whether table has funcref elem in call_indirect
TianlongLiang Jan 2, 2025
783ed16
check whether table has funcref elem in call_indirect when gc is enabled
TianlongLiang Jan 3, 2025
0854fcc
fix typo
TianlongLiang Jan 3, 2025
7061f76
resolve unused but set variable
TianlongLiang Jan 3, 2025
4db1aef
cr suggestions
TianlongLiang Jan 6, 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
62 changes: 62 additions & 0 deletions core/iwasm/interpreter/wasm_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12083,6 +12083,12 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
{
int32 idx;
WASMFuncType *func_type;
uint32 tbl_elem_type;
#if WASM_ENABLE_GC != 0
WASMRefType *elem_ref_type = NULL;
WASMType *concrete_heap_type = NULL;
bool is_valid_heap_type = false;
#endif

read_leb_uint32(p, p_end, type_idx);
#if WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0
Expand All @@ -12105,6 +12111,62 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
error_buf_size)) {
goto fail;
}
tbl_elem_type =
table_idx < module->import_table_count
? module->import_tables[table_idx]
.u.table.table_type.elem_type
: module->tables[table_idx - module->import_table_count]
.table_type.elem_type;

#if WASM_ENABLE_GC == 0 && WASM_ENABLE_REF_TYPES != 0
if (tbl_elem_type != VALUE_TYPE_FUNCREF) {
set_error_buf_v(error_buf, error_buf_size,
"type mismatch: instruction requires table "
"of functions but table %u has externref",
table_idx);
goto fail;
}
#elif WASM_ENABLE_GC != 0
/* For call_indirect, if table element is heaptype, then it's
* valid only if it's (ref null? func) or (ref null? $t) where t
* is a concrete heap type that match funcref */
TianlongLiang marked this conversation as resolved.
Show resolved Hide resolved
if (tbl_elem_type == REF_TYPE_HT_NON_NULLABLE
|| tbl_elem_type == REF_TYPE_HT_NULLABLE) {
elem_ref_type =
table_idx < module->import_table_count
? module->import_tables[table_idx]
.u.table.table_type.elem_ref_type
: module
->tables[table_idx
- module->import_table_count]
.table_type.elem_ref_type;

if (elem_ref_type->ref_ht_common.heap_type
== HEAP_TYPE_FUNC) {
/* ref null? func */
is_valid_heap_type = true;
}
else if (elem_ref_type->ref_ht_common.heap_type > 0) {
/* ref null? $t */
concrete_heap_type =
module
->types[elem_ref_type->ref_ht_common.heap_type];
is_valid_heap_type =
concrete_heap_type->type_flag == WASM_TYPE_FUNC;
}
}

if (tbl_elem_type != REF_TYPE_FUNCREF && !is_valid_heap_type) {
set_error_buf_v(error_buf, error_buf_size,
"type mismatch: instruction requires "
"reference type t match type ref null func"
"in table %u",
table_idx);
goto fail;
}
#else
(void)tbl_elem_type;
#endif

#if WASM_ENABLE_FAST_INTERP != 0
/* we need to emit before arguments */
Expand Down
9 changes: 9 additions & 0 deletions core/iwasm/interpreter/wasm_mini_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6686,6 +6686,15 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
goto fail;
}

bh_assert(
(table_idx < module->import_table_count
? module->import_tables[table_idx]
.u.table.table_type.elem_type
: module
->tables[table_idx - module->import_table_count]
.table_type.elem_type)
== VALUE_TYPE_FUNCREF);

#if WASM_ENABLE_FAST_INTERP != 0
/* we need to emit before arguments */
emit_uint32(loader_ctx, type_idx);
Expand Down
Loading