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/parseTools.mjs

@@ -1094,14 +1094,23 @@ function implicitSelf() {
 }
 
 function ENVIRONMENT_IS_MAIN_THREAD() {
+  assert(PTHREADS || WASM_WORKERS);
   var envs = [];
   if (PTHREADS) envs.push('ENVIRONMENT_IS_PTHREAD');
   if (WASM_WORKERS) envs.push('ENVIRONMENT_IS_WASM_WORKER');
-  if (AUDIO_WORKLET) envs.push('ENVIRONMENT_IS_AUDIO_WORKLET');
   if (envs.length == 0) return 'true';
   return '(!(' + envs.join('||') + '))';
 }
 
+function ENVIRONMENT_IS_WORKER_THREAD() {
+  assert(PTHREADS || WASM_WORKERS);
+  var envs = [];
+  if (PTHREADS) envs.push('ENVIRONMENT_IS_PTHREAD');
+  if (WASM_WORKERS) envs.push('ENVIRONMENT_IS_WASM_WORKER');
+  if (envs.length == 0) return 'true';
+  return '(' + envs.join('||') + ')';
+}
+
 addToCompileTimeContext({
   ATEXITS,
   ATINITS,
@@ -1120,6 +1129,7 @@ addToCompileTimeContext({
   TARGET_NOT_SUPPORTED,
   WASM_PAGE_SIZE,
   ENVIRONMENT_IS_MAIN_THREAD,
+  ENVIRONMENT_IS_WORKER_THREAD,
   addAtExit,
   addAtInit,
   addReadyPromiseAssertions,

src/postamble.js

@@ -161,25 +161,9 @@ function run() {
     return;
   }
 
-#if WASM_WORKERS
-  if (ENVIRONMENT_IS_WASM_WORKER) {
-#if MODULARIZE
-    readyPromiseResolve(Module);
-#endif // MODULARIZE
-    return initRuntime();
-  }
-#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
+#if PTHREADS || WASM_WORKERS
+  if ({{{ ENVIRONMENT_IS_WORKER_THREAD() }}}) {
     initRuntime();
-    startWorker(Module);
     return;
   }
 #endif
@@ -213,9 +197,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
@@ -219,7 +216,7 @@ function initRuntime() {
 #endif
 
 #if PTHREADS
-  if (ENVIRONMENT_IS_PTHREAD) return;
+  if (ENVIRONMENT_IS_PTHREAD) return startWorker(Module);
 #endif
 
 #if STACK_OVERFLOW_CHECK
@@ -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/codesize/test_codesize_minimal_pthreads.gzsize

@@ -1 +1 @@
-4208
+4209

test/other/codesize/test_codesize_minimal_pthreads.jssize

@@ -1 +1 @@
-8703
+8716

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