Skip to content

Use upstream name for __post_instantiate (__wasm_call_ctors) #13904

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
sbc100 merged 1 commit into from
Apr 15, 2021
Merged

Use upstream name for __post_instantiate (__wasm_call_ctors) #13904

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
9 changes: 7 additions & 2 deletions src/library_dylink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ var LibraryDylink = {

// initialize the module
#if USE_PTHREADS
// The main thread does a full __post_instantiate (which includes a call
// The main thread does a full __wasm_call_ctors (which includes a call
// to emscripten_tls_init), but secondary threads should not call static
// constructors in general - emscripten_tls_init is the exception.
if (ENVIRONMENT_IS_PTHREAD) {
Expand All @@ -512,7 +512,12 @@ var LibraryDylink = {
PThread.tlsInitFunctions.push(init);
} else {
#endif
var init = moduleExports['__post_instantiate'];
var init = moduleExports['__wasm_call_ctors'];
// TODO(sbc): Remove this once extra check once the binaryen
// change propogates: https://github.com/WebAssembly/binaryen/pull/3811
if (!init) {
init = moduleExports['__post_instantiate'];
}
if (init) {
if (runtimeInitialized) {
init();
Expand Down