From 3cd0254564f0bb8631273ab0a55215b5fa75a8d0 Mon Sep 17 00:00:00 2001
From: Wenyong Huang <wenyong.huang@intel.com>
Date: Mon, 11 Jul 2022 17:35:43 +0800
Subject: [PATCH] Backup module inst in aot_create_exec_env_and_call_function

---
 core/iwasm/aot/aot_runtime.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/iwasm/aot/aot_runtime.c b/core/iwasm/aot/aot_runtime.c
index 64024ce07..e976bc262 100644
--- a/core/iwasm/aot/aot_runtime.c
+++ b/core/iwasm/aot/aot_runtime.c
@@ -1590,6 +1590,7 @@ aot_create_exec_env_and_call_function(AOTModuleInstance *module_inst,
                                       uint32 argv[])
 {
     WASMExecEnv *exec_env = NULL, *existing_exec_env = NULL;
+    WASMModuleInstanceCommon *prev_module_inst;
     bool ret;
 
 #if defined(OS_ENABLE_HW_BOUND_CHECK)
@@ -1608,8 +1609,21 @@ aot_create_exec_env_and_call_function(AOTModuleInstance *module_inst,
         }
     }
 
+    /**
+     * Backup the exec_env's module instance and then set it to current module
+     * instance, since in some cases, a wasm instance might call another with
+     * the help of host functions, which leads to recursive callings between
+     * host embedder and aot functions, and all the instances in the recursive
+     * call chain share the same exec_env.
+     */
+    prev_module_inst = exec_env->module_inst;
+    exec_env->module_inst = (WASMModuleInstanceCommon *)module_inst;
+
     ret = aot_call_function(exec_env, func, argc, argv);
 
+    /* Restore the module instance */
+    exec_env->module_inst = prev_module_inst;
+
     /* don't destroy the exec_env if it's searched from the cluster */
     if (!existing_exec_env)
         wasm_exec_env_destroy(exec_env);