|
|
@@ -6384,12 +6384,13 @@ re_scan:
|
|
|
goto fail;
|
|
|
}
|
|
|
|
|
|
- if (func_idx == cur_func_idx + module->import_function_count) {
|
|
|
+ /* Refer to a forward-declared function */
|
|
|
+ if (func_idx >= cur_func_idx + module->import_function_count) {
|
|
|
WASMTableSeg *table_seg = module->table_segments;
|
|
|
bool func_declared = false;
|
|
|
uint32 j;
|
|
|
|
|
|
- /* Check whether current function is declared */
|
|
|
+ /* Check whether the function is declared in table segs */
|
|
|
for (i = 0; i < module->table_seg_count; i++, table_seg++) {
|
|
|
if (table_seg->elem_type == VALUE_TYPE_FUNCREF
|
|
|
&& wasm_elem_is_declarative(table_seg->mode)) {
|
|
|
@@ -6402,10 +6403,17 @@ re_scan:
|
|
|
}
|
|
|
}
|
|
|
if (!func_declared) {
|
|
|
- set_error_buf(error_buf, error_buf_size,
|
|
|
- "undeclared function reference");
|
|
|
- goto fail;
|
|
|
+ /* Check whether the function is exported */
|
|
|
+ for (i = 0; i < module->export_count; i++) {
|
|
|
+ if (module->exports[i].kind == EXPORT_KIND_FUNC
|
|
|
+ && module->exports[i].index == func_idx) {
|
|
|
+ func_declared = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+ bh_assert(func_declared);
|
|
|
+ (void)func_declared;
|
|
|
}
|
|
|
|
|
|
#if WASM_ENABLE_FAST_INTERP != 0
|