fix: store and retrieve exec env from module instance

Author: eloparco

core/iwasm/aot/aot_runtime.c

@@ -1413,6 +1413,8 @@ aot_call_function(WASMExecEnv *exec_env, AOTFunctionInstance *function,
                   unsigned argc, uint32 argv[])
 {
     AOTModuleInstance *module_inst = (AOTModuleInstance *)exec_env->module_inst;
+    module_inst->e->common.exec_env = exec_env;
+
     AOTFuncType *func_type = function->u.func.func_type;
     uint32 result_count = func_type->result_count;
     uint32 ext_ret_count = result_count > 1 ? result_count - 1 : 0;

core/iwasm/common/wasm_memory.c

@@ -703,8 +703,7 @@ wasm_enlarge_memory_internal(WASMModuleInstance *module, uint32 inc_page_count)
     if (!ret && enlarge_memory_error_cb)
         enlarge_memory_error_cb(inc_page_count, total_size_old, 0,
                                 failure_reason, (wasm_module_inst_t)module,
-                                wasm_runtime_get_exec_env_singleton(
-                                    (WASMModuleInstanceCommon *)module));
+                                module->e->common.exec_env);
 
     return ret;
 }
@@ -796,8 +795,7 @@ wasm_enlarge_memory_internal(WASMModuleInstance *module, uint32 inc_page_count)
     if (!ret && enlarge_memory_error_cb)
         enlarge_memory_error_cb(inc_page_count, total_size_old, 0,
                                 failure_reason, (wasm_module_inst_t)module,
-                                wasm_runtime_get_exec_env_singleton(
-                                    (WASMModuleInstanceCommon *)module));
+                                module->e->common.exec_env);
 
     return ret;
 }

core/iwasm/interpreter/wasm_runtime.c

@@ -2396,6 +2396,7 @@ wasm_call_function(WASMExecEnv *exec_env, WASMFunctionInstance *function,
 {
     WASMModuleInstance *module_inst =
         (WASMModuleInstance *)exec_env->module_inst;
+    module_inst->e->common.exec_env = exec_env;
 
     /* set thread handle and stack boundary */
     wasm_exec_env_set_thread_info(exec_env);

core/iwasm/interpreter/wasm_runtime.h

@@ -213,6 +213,7 @@ typedef struct CApiFuncImport {
 /* The common part of WASMModuleInstanceExtra and AOTModuleInstanceExtra */
 typedef struct WASMModuleInstanceExtraCommon {
     CApiFuncImport *c_api_func_imports;
+    WASMExecEnv *exec_env;
 #if WASM_CONFIGUABLE_BOUNDS_CHECKS != 0
     /* Disable bounds checks or not */
     bool disable_bounds_checks;