Skip to content

Commit b18cb3b

Browse files
authored
[instantiation linking] Create and import WASMGlobalInstance (bytecodealliance#3914)
1 parent 23c8be1 commit b18cb3b

23 files changed

+1255
-376
lines changed

core/iwasm/aot/aot_loader.c

+8-2
Original file line numberDiff line numberDiff line change
@@ -2144,9 +2144,11 @@ load_import_globals(const uint8 **p_buf, const uint8 *buf_end,
21442144
AOTImportGlobal *import_globals;
21452145
uint64 size;
21462146
uint32 i, data_offset = 0;
2147+
#if WASM_ENABLE_MULTI_MODULE != 0
21472148
#if WASM_ENABLE_LIBC_BUILTIN != 0
21482149
WASMGlobalImport tmp_global;
21492150
#endif
2151+
#endif /* WASM_ENABLE_MULTI_MODULE != 0 */
21502152

21512153
/* Allocate memory */
21522154
size = sizeof(AOTImportGlobal) * (uint64)module->import_global_count;
@@ -2167,6 +2169,7 @@ load_import_globals(const uint8 **p_buf, const uint8 *buf_end,
21672169
return false;
21682170
}
21692171

2172+
#if WASM_ENABLE_MULTI_MODULE != 0
21702173
#if WASM_ENABLE_LIBC_BUILTIN != 0
21712174
if (wasm_native_lookup_libc_builtin_global(
21722175
import_globals[i].module_name, import_globals[i].global_name,
@@ -2182,9 +2185,12 @@ load_import_globals(const uint8 **p_buf, const uint8 *buf_end,
21822185
tmp_global.global_data_linked;
21832186
import_globals[i].is_linked = true;
21842187
}
2185-
#else
2186-
import_globals[i].is_linked = false;
2188+
else
21872189
#endif
2190+
#endif /* WASM_ENABLE_MULTI_MODULE != 0 */
2191+
{
2192+
import_globals[i].is_linked = false;
2193+
}
21882194

21892195
import_globals[i].size =
21902196
wasm_value_type_size(import_globals[i].type.val_type);

0 commit comments

Comments
 (0)