Don't resolve ready promise until after runtime init

Author: sbc100

src/library.js

@@ -128,7 +128,11 @@ 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) {
+        // If the runtime has not yet been initializated then reject the
+        // ready promise instead of logging the error here.
+        readyPromiseReject(msg);
+      } else
 #endif // MODULARIZE
       err(msg);
     }

src/postamble.js

@@ -163,10 +163,10 @@ function run() {
 
 #if PTHREADS || WASM_WORKERS
   if ({{{ ENVIRONMENT_IS_WORKER_THREAD() }}}) {
+    initRuntime();
 #if MODULARIZE
     readyPromiseResolve(Module);
 #endif
-    initRuntime();
     return;
   }
 #endif
@@ -195,14 +195,14 @@ function run() {
     if (ABORT) return;
 
     initRuntime();
+#if MODULARIZE
+    readyPromiseResolve(Module);
+#endif
 
 #if HAS_MAIN
     preMain();
 #endif
 
-#if MODULARIZE
-    readyPromiseResolve(Module);
-#endif
 #if expectToReceiveOnModule('onRuntimeInitialized')
     Module['onRuntimeInitialized']?.();
 #endif

src/preamble.js

@@ -473,11 +473,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
+54737

test/other/test_unoptimized_code_size_no_asserts.js.size

@@ -1 +1 @@
-30416
+30225

test/other/test_unoptimized_code_size_strict.js.size

@@ -1 +1 @@
-53724
+53533