Unify readyPromiseResolve calls

src/library.js

@@ -128,7 +128,10 @@ addToLibrary({
     if (keepRuntimeAlive() && !implicit) {
       var msg = `program exited (with status: ${status}), but keepRuntimeAlive() is set (counter=${runtimeKeepaliveCounter}) due to an async operation, so halting execution but not exiting the runtime or preventing further async execution (you can use emscripten_force_exit, if you want to force a true shutdown)`;
 #if MODULARIZE
-      readyPromiseReject(msg);
+      if (!runtimeInitialized) {
+        readyPromiseReject(msg);
+        return;
+      }
 #endif // MODULARIZE
       err(msg);
     }

src/postamble.js

@@ -163,21 +163,13 @@ function run() {
 
 #if WASM_WORKERS
   if (ENVIRONMENT_IS_WASM_WORKER) {
-#if MODULARIZE
-    readyPromiseResolve(Module);
-#endif // MODULARIZE
-    return initRuntime();
+    initRuntime();
+    return;
   }
 #endif
 
 #if PTHREADS
   if (ENVIRONMENT_IS_PTHREAD) {
-#if MODULARIZE
-    // The promise resolve function typically gets called as part of the execution
-    // of `doRun` below. The workers/pthreads don't execute `doRun` so the
-    // creation promise can be resolved, marking the pthread-Module as initialized.
-    readyPromiseResolve(Module);
-#endif // MODULARIZE
     initRuntime();
     startWorker(Module);
     return;
@@ -213,9 +205,6 @@ function run() {
     preMain();
 #endif
 
-#if MODULARIZE
-    readyPromiseResolve(Module);
-#endif
 #if expectToReceiveOnModule('onRuntimeInitialized')
     Module['onRuntimeInitialized']?.();
 #endif

src/preamble.js

@@ -205,10 +205,7 @@ function preRun() {
   callRuntimeCallbacks(__ATPRERUN__);
 }
 
-function initRuntime() {
-#if RUNTIME_DEBUG
-  dbg('initRuntime');
-#endif
+function doInitRuntime() {
 #if ASSERTIONS
   assert(!runtimeInitialized);
 #endif
@@ -237,6 +234,16 @@ function initRuntime() {
   callRuntimeCallbacks(__ATINIT__);
 }
 
+function initRuntime() {
+#if RUNTIME_DEBUG
+  dbg('initRuntime');
+#endif
+  doInitRuntime();
+#if MODULARIZE
+  readyPromiseResolve(Module);
+#endif
+}
+
 #if HAS_MAIN
 function preMain() {
 #if STACK_OVERFLOW_CHECK
@@ -471,11 +478,13 @@ function abort(what) {
   var e = new WebAssembly.RuntimeError(what);
 
 #if MODULARIZE
-  readyPromiseReject(e);
+  if (!runtimeInitialized) {
+    // If the runtime has not yet been initializated then reject the
+    // ready promise instead of thowing the error;
+    readyPromiseReject(e);
+    return;
+  }
 #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;
 }
 

test/other/test_unoptimized_code_size.js.size

@@ -1 +1 @@
-54928
+54786

test/other/test_unoptimized_code_size_no_asserts.js.size

@@ -1 +1 @@
-30574
+30432

test/other/test_unoptimized_code_size_strict.js.size

@@ -1 +1 @@
-53724
+53582