fix: update assert condition and move termination check

Author: eloparco

core/iwasm/common/wasm_runtime_common.c

@@ -194,6 +194,11 @@ runtime_signal_handler(void *sig_addr)
         else if (exec_env_tls->exce_check_guard_page <= (uint8 *)sig_addr
                  && (uint8 *)sig_addr
                         < exec_env_tls->exce_check_guard_page + page_size) {
+            bh_assert(wasm_get_exception(module_inst)
+#if WASM_ENABLE_THREAD_MGR != 0
+                      || wasm_cluster_is_thread_terminated(exec_env_tls)
+#endif
+            );
             os_longjmp(jmpbuf_node->jmpbuf, 1);
         }
     }
@@ -249,7 +254,11 @@ runtime_exception_handler(EXCEPTION_POINTERS *exce_info)
             else if (exec_env_tls->exce_check_guard_page <= (uint8 *)sig_addr
                      && (uint8 *)sig_addr
                             < exec_env_tls->exce_check_guard_page + page_size) {
-                bh_assert(wasm_get_exception(module_inst));
+                bh_assert(wasm_get_exception(module_inst)
+#if WASM_ENABLE_THREAD_MGR != 0
+                          || wasm_cluster_is_thread_terminated(exec_env_tls)
+#endif
+                );
                 if (module_inst->module_type == Wasm_Module_Bytecode) {
                     return EXCEPTION_CONTINUE_SEARCH;
                 }

core/iwasm/compilation/aot_emit_function.c

@@ -857,14 +857,6 @@ aot_compile_op_call(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
                 goto fail;
             }
 
-#if WASM_ENABLE_THREAD_MGR != 0
-            /* Insert suspend check point */
-            if (comp_ctx->enable_thread_mgr) {
-                if (!check_suspend_flags(comp_ctx, func_ctx))
-                    return false;
-            }
-#endif
-
             /* Check whether there was exception thrown when executing
                the function */
             if (!check_exception_thrown(comp_ctx, func_ctx)) {
@@ -1007,6 +999,14 @@ aot_compile_op_call(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
     }
 #endif
 
+#if WASM_ENABLE_THREAD_MGR != 0
+    /* Insert suspend check point */
+    if (comp_ctx->enable_thread_mgr) {
+        if (!check_suspend_flags(comp_ctx, func_ctx))
+            return false;
+    }
+#endif
+
     ret = true;
 fail:
     if (param_types)
@@ -1653,6 +1653,14 @@ aot_compile_op_call_indirect(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
     }
 #endif
 
+#if WASM_ENABLE_THREAD_MGR != 0
+    /* Insert suspend check point */
+    if (comp_ctx->enable_thread_mgr) {
+        if (!check_suspend_flags(comp_ctx, func_ctx))
+            return false;
+    }
+#endif
+
     ret = true;
 
 fail:

core/iwasm/libraries/thread-mgr/thread_manager.c

@@ -1136,9 +1136,10 @@ set_exception_visitor(void *node, void *user_data)
         bh_memcpy_s(curr_wasm_inst->cur_exception,
                     sizeof(curr_wasm_inst->cur_exception),
                     wasm_inst->cur_exception, sizeof(wasm_inst->cur_exception));
-        /* Terminate the thread so it can exit from dead loops */
-        set_thread_cancel_flags(curr_exec_env);
     }
+
+    /* Terminate the thread so it can exit from dead loops */
+    set_thread_cancel_flags(curr_exec_env);
 }
 
 static void