christoph/wamr
1
Fork 0
Code Releases Activity

Revert "Return error when exception was raised after main thread finishes" (#2524)

Browse Source 
This reverts commit 71d43f3ca1.
This commit is contained in:
YAMAMOTO Takashi
2023-09-04 19:01:09 +09:00
committed by GitHub
parent 2e78230e06
commit 9e3904337e
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/iwasm/libraries/lib-wasi-threads/test/trap_after_main_thread_finishes.json
View File

@ -1,3 +0,0 @@
{
"exit_code": 1
}

6
product-mini/platforms/posix/main.c
View File

@ -921,12 +921,8 @@ main(int argc, char *argv[])
#if WASM_ENABLE_LIBC_WASI != 0 #if WASM_ENABLE_LIBC_WASI != 0
if (ret == 0) { if (ret == 0) {
/* wait for threads to finish and propagate wasi exit code. */ /* propagate wasi exit code. */
ret = wasm_runtime_get_wasi_exit_code(wasm_module_inst); ret = wasm_runtime_get_wasi_exit_code(wasm_module_inst);
if (wasm_runtime_get_exception(wasm_module_inst)) {
/* got an exception in spawned thread */
ret = 1;
}
} }
#endif #endif

6
product-mini/platforms/windows/main.c
View File

@ -554,12 +554,8 @@ main(int argc, char *argv[])
#if WASM_ENABLE_LIBC_WASI != 0 #if WASM_ENABLE_LIBC_WASI != 0
if (ret == 0) { if (ret == 0) {
/* wait for threads to finish and propagate wasi exit code. */ /* propagate wasi exit code. */
ret = wasm_runtime_get_wasi_exit_code(wasm_module_inst); ret = wasm_runtime_get_wasi_exit_code(wasm_module_inst);
if (wasm_runtime_get_exception(wasm_module_inst)) {
/* got an exception in spawned thread */
ret = 1;
}
} }
#endif #endif