Skip to content

Commit 00c2aa1

Browse files
authored
Drop declarative elements on module instantiation (#3922)
1 parent 62aca17 commit 00c2aa1

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

core/iwasm/aot/aot_runtime.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1905,7 +1905,9 @@ aot_instantiate(AOTModule *module, AOTModuleInstance *parent,
19051905
goto fail;
19061906
}
19071907
for (i = 0; i < module->table_init_data_count; i++) {
1908-
if (wasm_elem_is_active(module->table_init_data_list[i]->mode))
1908+
if (wasm_elem_is_active(module->table_init_data_list[i]->mode)
1909+
|| wasm_elem_is_declarative(
1910+
module->table_init_data_list[i]->mode))
19091911
bh_bitmap_set_bit(common->elem_dropped, i);
19101912
}
19111913
}

core/iwasm/interpreter/wasm_runtime.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2467,7 +2467,8 @@ wasm_instantiate(WASMModule *module, WASMModuleInstance *parent,
24672467
goto fail;
24682468
}
24692469
for (i = 0; i < module->table_seg_count; i++) {
2470-
if (wasm_elem_is_active(module->table_segments[i].mode))
2470+
if (wasm_elem_is_active(module->table_segments[i].mode)
2471+
|| wasm_elem_is_declarative(module->table_segments[i].mode))
24712472
bh_bitmap_set_bit(module_inst->e->common.elem_dropped, i);
24722473
}
24732474
}

0 commit comments

Comments
 (0)