gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-06-18 02:59:21 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix build error when enable custom section without interpreter (#1229)

Browse Source
This commit is contained in:
Xu Jun 2022-06-15 18:14:39 +08:00 committed by GitHub
parent 1705ae569b
commit e0a8aa09be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/iwasm/aot/aot_loader.c
View File

@ -12,9 +12,6 @@
#include "../compilation/aot.h" #include "../compilation/aot.h"
#if WASM_ENABLE_JIT != 0 #if WASM_ENABLE_JIT != 0
#include "../compilation/aot_llvm.h" #include "../compilation/aot_llvm.h"
#endif
#if (WASM_ENABLE_JIT != 0) || (WASM_ENABLE_LOAD_CUSTOM_SECTION != 0)
#include "../interpreter/wasm_loader.h" #include "../interpreter/wasm_loader.h"
#endif #endif
@ -3296,7 +3293,7 @@ aot_unload(AOTModule *module)
#endif #endif
#if WASM_ENABLE_LOAD_CUSTOM_SECTION != 0 #if WASM_ENABLE_LOAD_CUSTOM_SECTION != 0
wasm_loader_destroy_custom_sections(module->custom_section_list); wasm_runtime_destroy_custom_sections(module->custom_section_list);
#endif #endif
wasm_runtime_free(module); wasm_runtime_free(module);

13
core/iwasm/common/wasm_runtime_common.c
View File

@ -4905,3 +4905,16 @@ wasm_runtime_show_app_heap_corrupted_prompt()
"compiled by asc, please add --exportRuntime to " "compiled by asc, please add --exportRuntime to "
"export the runtime helpers."); "export the runtime helpers.");
} }
#if WASM_ENABLE_LOAD_CUSTOM_SECTION != 0
void
wasm_runtime_destroy_custom_sections(WASMCustomSection *section_list)
{
WASMCustomSection *section = section_list, *next;
while (section) {
next = section->next;
wasm_runtime_free(section);
section = next;
}
}
#endif /* end of WASM_ENABLE_LOAD_CUSTOM_SECTION */

5
core/iwasm/common/wasm_runtime_common.h
View File

@ -884,6 +884,11 @@ wasm_runtime_invoke_c_api_native(WASMModuleInstanceCommon *module_inst,
void void
wasm_runtime_show_app_heap_corrupted_prompt(); wasm_runtime_show_app_heap_corrupted_prompt();
#if WASM_ENABLE_LOAD_CUSTOM_SECTION != 0
void
wasm_runtime_destroy_custom_sections(WASMCustomSection *section_list);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

15
core/iwasm/interpreter/wasm_loader.c
View File

@ -3788,7 +3788,7 @@ wasm_loader_unload(WASMModule *module)
#endif #endif
#if WASM_ENABLE_LOAD_CUSTOM_SECTION != 0 #if WASM_ENABLE_LOAD_CUSTOM_SECTION != 0
wasm_loader_destroy_custom_sections(module->custom_section_list); wasm_runtime_destroy_custom_sections(module->custom_section_list);
#endif #endif
wasm_runtime_free(module); wasm_runtime_free(module);
@ -6503,18 +6503,7 @@ wasm_loader_get_custom_section(WASMModule *module, const char *name,
return false; return false;
} }
#endif
void
wasm_loader_destroy_custom_sections(WASMCustomSection *section_list)
{
WASMCustomSection *section = section_list, *next;
while (section) {
next = section->next;
wasm_runtime_free(section);
section = next;
}
}
#endif /* end of WASM_ENABLE_LOAD_CUSTOM_SECTION */
static bool static bool
wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func, wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,

5
core/iwasm/interpreter/wasm_loader.h
View File

@ -73,11 +73,6 @@ wasm_loader_find_block_addr(WASMExecEnv *exec_env, BlockAddr *block_addr_cache,
uint8 block_type, uint8 **p_else_addr, uint8 block_type, uint8 **p_else_addr,
uint8 **p_end_addr); uint8 **p_end_addr);
#if WASM_ENABLE_LOAD_CUSTOM_SECTION != 0
void
wasm_loader_destroy_custom_sections(WASMCustomSection *section_list);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif