gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-07-15 16:58:34 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

recover context from prev_frame

Browse Source
This commit is contained in:
Wenyong Huang 2024-04-07 09:49:04 +08:00
parent 0efdd1fea3
commit 59c2ef5ece
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
core/iwasm/interpreter/wasm_interp_classic.c
View File

@ -6352,15 +6352,27 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
if (cur_func->import_func_inst) { if (cur_func->import_func_inst) {
wasm_interp_call_func_import(module, exec_env, cur_func, wasm_interp_call_func_import(module, exec_env, cur_func,
prev_frame); prev_frame);
#if WASM_ENABLE_TAIL_CALL != 0 || WASM_ENABLE_GC != 0
if (is_return_call) {
/* the frame was freed before tail calling and
the prev_frame was set as exec_env's cur_frame,
so here we recover context from prev_frame */
RECOVER_CONTEXT(prev_frame);
}
else
#endif
{
prev_frame = frame->prev_frame;
cur_func = frame->function;
UPDATE_ALL_FROM_FRAME();
}
#if WASM_ENABLE_EXCE_HANDLING != 0 #if WASM_ENABLE_EXCE_HANDLING != 0
char uncaught_exception[128] = { 0 }; char uncaught_exception[128] = { 0 };
bool has_exception = bool has_exception =
wasm_copy_exception(module, uncaught_exception); wasm_copy_exception(module, uncaught_exception);
if (has_exception if (has_exception
&& strstr(uncaught_exception, "uncaught wasm exception")) { && strstr(uncaught_exception, "uncaught wasm exception")) {
/* fix framesp */
UPDATE_ALL_FROM_FRAME();
uint32 import_exception; uint32 import_exception;
/* initialize imported exception index to be invalid */ /* initialize imported exception index to be invalid */
SET_INVALID_TAGINDEX(import_exception); SET_INVALID_TAGINDEX(import_exception);
@ -6402,19 +6414,20 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
{ {
wasm_interp_call_func_native(module, exec_env, cur_func, wasm_interp_call_func_native(module, exec_env, cur_func,
prev_frame); prev_frame);
}
#if WASM_ENABLE_TAIL_CALL != 0 || WASM_ENABLE_GC != 0 #if WASM_ENABLE_TAIL_CALL != 0 || WASM_ENABLE_GC != 0
/* Don't restore some variables from frame for tail call, since if (is_return_call) {
they weren't committed into the frame previously and are /* the frame was freed before tail calling and
available now. Instead, the frame was freed, allocated and the prev_frame was set as exec_env's cur_frame,
set again, restoring from it may cause unexped behavior. */ so here we recover context from prev_frame */
if (!is_return_call) RECOVER_CONTEXT(prev_frame);
}
else
#endif #endif
{ {
prev_frame = frame->prev_frame; prev_frame = frame->prev_frame;
cur_func = frame->function; cur_func = frame->function;
UPDATE_ALL_FROM_FRAME(); UPDATE_ALL_FROM_FRAME();
}
} }
/* update memory size, no need to update memory ptr as /* update memory size, no need to update memory ptr as

12
core/iwasm/interpreter/wasm_interp_fast.c
View File

@ -5866,11 +5866,13 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
} }
#if WASM_ENABLE_TAIL_CALL != 0 || WASM_ENABLE_GC != 0 #if WASM_ENABLE_TAIL_CALL != 0 || WASM_ENABLE_GC != 0
/* Don't restore some variables from frame for tail call, since if (is_return_call) {
they weren't committed into the frame previously and are /* the frame was freed before tail calling and
available now. Instead, the frame was freed, allocated and the prev_frame was set as exec_env's cur_frame,
set again, restoring from it may cause unexped behavior. */ so here we recover context from prev_frame */
if (!is_return_call) RECOVER_CONTEXT(prev_frame);
}
else
#endif #endif
{ {
prev_frame = frame->prev_frame; prev_frame = frame->prev_frame;