Skip to content

Use RuntimeError in abort() before module instantiation #18664

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
merged 5 commits into from
Feb 8, 2023
Merged

Use RuntimeError in abort() before module instantiation #18664

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d17962
Use RuntimeError in abort() before module instantiation
aheejin Feb 4, 2023
8dcdcb2
Update src/preamble.js
aheejin Feb 7, 2023
a48c85e
Remove `throwError`
aheejin Feb 7, 2023
060e9e7
Address comments
aheejin Feb 7, 2023
89bf294
Indent fix
aheejin Feb 7, 2023
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
39 changes: 28 additions & 11 deletions src/preamble.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,20 +469,37 @@ function abort(what) {
// defintion for WebAssembly.RuntimeError claims it takes no arguments even
// though it can.
// TODO(https://github.com/google/closure-compiler/pull/3913): Remove if/when upstream closure gets fixed.
#if WASM_EXCEPTIONS == 1
// See above, in the meantime, we resort to wasm code for trapping.
___trap();
#else
/** @suppress {checkTypes} */
var e = new WebAssembly.RuntimeError(what);

function throwError(what) {
/** @suppress {checkTypes} */
var e = new WebAssembly.RuntimeError(what);

#if MODULARIZE
readyPromiseReject(e);
readyPromiseReject(e);
#endif
// Throw the error whether or not MODULARIZE is set because abort is used
// in code paths apart from instantiation where an exception is expected
// to be thrown when abort is called.
throw e;
// Throw the error whether or not MODULARIZE is set because abort is used
// in code paths apart from instantiation where an exception is expected
// to be thrown when abort is called.
throw e;
}

#if WASM_EXCEPTIONS == 1
// See above, in the meantime, we resort to wasm code for trapping.
//
// In case abort() is called before the module is initialized, Module['asm']
// and its exported '__trap' function is not available, in which case we throw
// a RuntimeError.
//
// We trap instead of throwing RuntimeError to prevent infinite-looping in
// Wasm EH code (because RuntimeError is considered as a foreign exception and
// caught by 'catch_all'), but in case throwing RuntimeError is fine because
// the module has not even been instantiated, even less running.
if (typeof Module['asm'] !== 'undefined')
Copy link
Member

@kripken kripken Feb 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this check if (runtimeInitialized) ? I think that should work but I'm not sure. It's generally the right condition to check before calling into the wasm, like ___trap() here, but maybe this place is special somehow.

Copy link
Member Author

@aheejin aheejin Feb 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if (runtimeInitialized) seems to work, thanks. Didn't know that variable exited.

___trap();
else
throwError(what);
#else
throwError(what);
#endif
}

Expand Down