Skip to content

Make 'instantiateWasm' callback resolve the result return from 'recei… #23781

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 17 commits into from
Apr 10, 2025
Merged

Make 'instantiateWasm' callback resolve the result return from 'recei… #23781

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
feabf26
Make 'instantiateWasm' callback resolve the result return from 'recei…
gogogoghost Feb 27, 2025
532dff3
Update 'test_instantiate_wasm' to cover when ASYNCIFY and EXPORT_ES6 …
gogogoghost Feb 28, 2025
9d91469
Merge branch 'main' into main
gogogoghost Feb 28, 2025
4ddca57
Remove '-sEXPORT_ES6' from 'test_instantiate_wasm' and add a comment
gogogoghost Mar 1, 2025
9528492
Merge branch 'main' into main
gogogoghost Mar 1, 2025
fe1b791
Remove unnecessary parameters and calls
gogogoghost Mar 2, 2025
b4ad166
Merge branch 'main' of github.com:gogogoghost/emscripten
gogogoghost Mar 2, 2025
a73404f
Remove unnecessary output check
gogogoghost Mar 2, 2025
900d8d1
Merge branch 'main' into main
gogogoghost Mar 2, 2025
6775dbf
Merge branch 'emscripten-core:main' into main
gogogoghost Mar 19, 2025
06de16e
Merge branch 'main' into main
gogogoghost Apr 8, 2025
c76d934
Fix test browser.test_manual_wasm_instantiate
gogogoghost Apr 8, 2025
698f5ac
Remove useless parameter
gogogoghost Apr 8, 2025
3c56f4f
Restore test browser.test_manual_wasm_instantiate and allow test_manu…
gogogoghost Apr 10, 2025
91083ea
Merge branch 'main' into main
gogogoghost Apr 10, 2025
fea8cf7
Merge branch 'main' of github.com:gogogoghost/emscripten
gogogoghost Apr 10, 2025
e12cf37
Add -DASYNCIFY_ENABLED to distinguish ASYNCIFY
gogogoghost Apr 10, 2025
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: 1 addition & 2 deletions src/preamble.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,8 +990,7 @@ function getWasmImports() {
try {
#endif
Module['instantiateWasm'](info, (mod, inst) => {
receiveInstance(mod, inst);
resolve(mod.exports);
resolve(receiveInstance(mod, inst));
});
#if ASSERTIONS
} catch(e) {
Expand Down