From 9f4dbf48f5852c8ceb8c2fa3ddd24073da337772 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 19 Dec 2024 09:17:25 -0800
Subject: [PATCH] Convert loadWasmModuleToAllWorkers to async/await. NFC

---
 src/library_pthread.js   | 15 ++++++++-------
 src/postamble_minimal.js |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/library_pthread.js b/src/library_pthread.js
index 64d276410d3fa..6859c7009f882 100644
--- a/src/library_pthread.js
+++ b/src/library_pthread.js
@@ -107,9 +107,10 @@ var LibraryPThread = {
 #if !MINIMAL_RUNTIME
       // MINIMAL_RUNTIME takes care of calling loadWasmModuleToAllWorkers
       // in postamble_minimal.js
-      addOnPreRun(() => {
+      addOnPreRun(async () => {
         addRunDependency('loading-workers')
-        PThread.loadWasmModuleToAllWorkers(() => removeRunDependency('loading-workers'));
+        await PThread.loadWasmModuleToAllWorkers();
+        removeRunDependency('loading-workers');
       });
 #endif
 #if MAIN_MODULE
@@ -362,9 +363,9 @@ var LibraryPThread = {
       });
     }),
 
-    loadWasmModuleToAllWorkers(onMaybeReady) {
+    async loadWasmModuleToAllWorkers() {
 #if !PTHREAD_POOL_SIZE
-      onMaybeReady();
+      return;
 #else
       // Instantiation is synchronous in pthreads.
       if (
@@ -373,7 +374,7 @@ var LibraryPThread = {
         || ENVIRONMENT_IS_WASM_WORKER
 #endif
       ) {
-        return onMaybeReady();
+        return;
       }
 
       let pthreadPoolReady = Promise.all(PThread.unusedWorkers.map(PThread.loadWasmModuleToWorker));
@@ -383,9 +384,9 @@ var LibraryPThread = {
       // If the user wants to wait on it elsewhere, they can do so via the
       // Module['pthreadPoolReady'] promise.
       Module['pthreadPoolReady'] = pthreadPoolReady;
-      onMaybeReady();
+      return;
 #else
-      pthreadPoolReady.then(onMaybeReady);
+      await pthreadPoolReady;
 #endif // PTHREAD_POOL_DELAY_LOAD
 #endif // PTHREAD_POOL_SIZE
     },
diff --git a/src/postamble_minimal.js b/src/postamble_minimal.js
index f34830f0cbd59..094459314a1b8 100644
--- a/src/postamble_minimal.js
+++ b/src/postamble_minimal.js
@@ -222,7 +222,7 @@ WebAssembly.instantiate(Module['wasm'], imports).then((output) => {
 #if PTHREADS
   // Export Wasm module for pthread creation to access.
   wasmModule = output.module || Module['wasm'];
-  PThread.loadWasmModuleToAllWorkers(ready);
+  PThread.loadWasmModuleToAllWorkers().then(ready);
 #else
   ready();
 #endif