Skip to content

Revert "Return error when exception was raised after main thread fini… #2524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenyongh merged 1 commit into from
Sep 4, 2023
Merged

Revert "Return error when exception was raised after main thread fini… #2524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions core/iwasm/libraries/lib-wasi-threads/test/trap_after_main_thread_finishes.json
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions product-mini/platforms/posix/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,12 +921,8 @@ main(int argc, char *argv[])

#if WASM_ENABLE_LIBC_WASI != 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);
if (wasm_runtime_get_exception(wasm_module_inst)) {
/* got an exception in spawned thread */
ret = 1;
}
}
#endif

Expand Down
6 changes: 1 addition & 5 deletions product-mini/platforms/windows/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,12 +554,8 @@ main(int argc, char *argv[])

#if WASM_ENABLE_LIBC_WASI != 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);
if (wasm_runtime_get_exception(wasm_module_inst)) {
/* got an exception in spawned thread */
ret = 1;
}
}
#endif

Expand Down