fix adjust heap issues

bytecodealliance · Oct 30, 2024 · fbba2a3 · fbba2a3
1 parent 0c58cc1
commit fbba2a3
Show file tree

Hide file tree

Showing 9 changed files with 204 additions and 221 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,9 +21,10 @@ core/iwasm/libraries/lib-wasi-threads/test/*.wasm
 core/iwasm/libraries/lib-socket/test/*.wasm
 
 product-mini/app-samples/hello-world/test.wasm
-product-mini/platforms/linux-sgx/enclave-sample/App/
-product-mini/platforms/linux-sgx/enclave-sample/Enclave/
-product-mini/platforms/linux-sgx/enclave-sample/iwasm
+product-mini/platforms/linux-sgx/enclave-sample/App/*.o
+product-mini/platforms/linux-sgx/enclave-sample/Enclave/*.o
+product-mini/platforms/linux-sgx/enclave-sample/
+!product-mini/platforms/linux-sgx/enclave-sample/Makefile*
 
 build_out
 tests/wamr-test-suites/workspace

diff --git a/core/iwasm/common/wasm_runtime_common.c b/core/iwasm/common/wasm_runtime_common.c
@@ -7788,9 +7788,6 @@ wasm_runtime_destroy_extern_inst(WASMModuleCommon *module,
     if (!extern_inst)
         return;
 
-    extern_inst->module_name = NULL;
-    extern_inst->field_name = NULL;
-
     if (extern_inst->kind == WASM_IMPORT_EXPORT_KIND_MEMORY) {
         wasm_runtime_destroy_memory(module, extern_inst->u.memory);
         extern_inst->u.memory = NULL;
@@ -7800,6 +7797,9 @@ wasm_runtime_destroy_extern_inst(WASMModuleCommon *module,
                   extern_inst->module_name, extern_inst->field_name,
                   extern_inst->kind);
     }
+
+    extern_inst->module_name = NULL;
+    extern_inst->field_name = NULL;
 }
 
 /*
@@ -7841,7 +7841,7 @@ void
 wasm_runtime_destroy_imports(WASMModuleCommon *module,
                              WASMExternInstance *extern_inst_list)
 {
-    if (!module && !extern_inst_list)
+    if (!module || !extern_inst_list)
         return;
 
     for (int32 i = 0, import_count = wasm_runtime_get_import_count(module);

diff --git a/core/iwasm/include/wasm_export.h b/core/iwasm/include/wasm_export.h
@@ -973,7 +973,8 @@ wasm_runtime_set_module_inst(wasm_exec_env_t exec_env,
                              const wasm_module_inst_t module_inst);
 
 /**
- * Create a memory instance
+ * Create a memory instance.
+ * don't have a app heap
  *
  * @return The created memory instance if successful, NULL otherwise
  */

diff --git a/core/iwasm/interpreter/wasm_interp_classic.c b/core/iwasm/interpreter/wasm_interp_classic.c
@@ -6727,7 +6727,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
     || WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS == 0 \
     || WASM_ENABLE_BULK_MEMORY != 0
             if (memory)
-                linear_mem_size = GET_LINEAR_MEMORY_SIZE(memory);
+                linear_mem_size = get_linear_mem_size();
 #endif
             if (wasm_copy_exception(module, NULL)) {
 #if WASM_ENABLE_EXCE_HANDLING != 0

diff --git a/core/iwasm/interpreter/wasm_interp_fast.c b/core/iwasm/interpreter/wasm_interp_fast.c
@@ -5994,7 +5994,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
     || WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS == 0 \
     || WASM_ENABLE_BULK_MEMORY != 0
             if (memory)
-                linear_mem_size = GET_LINEAR_MEMORY_SIZE(memory);
+                linear_mem_size = get_linear_mem_size();
 #endif
             if (wasm_copy_exception(module, NULL))
                 goto got_exception;