Don't run PThread.initMainThread() on Wasm Workers. Fixes emscripten-…

…core#20279.
juj · Feb 7, 2024 · 2914a99 · 2914a99
1 parent 21f2533
commit 2914a99
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/library_pthread.js b/src/library_pthread.js
@@ -92,14 +92,10 @@ var LibraryPThread = {
 #if ASSERTIONS
       PThread.debugInit();
 #endif
-      if (ENVIRONMENT_IS_PTHREAD
-#if AUDIO_WORKLET
-        || ENVIRONMENT_IS_AUDIO_WORKLET
-#endif
-        ) {
-        PThread.initWorker();
-      } else {
+      if ({{{ ENVIRONMENT_IS_MAIN_THREAD() }}}) {
         PThread.initMainThread();
+      } else {
+        PThread.initWorker();
       }
     },
     initMainThread() {

diff --git a/src/parseTools.js b/src/parseTools.js
@@ -1043,3 +1043,12 @@ function getPerformanceNow() {
 function implicitSelf() {
   return ENVIRONMENT.includes('node') ? 'self.' : '';
 }
+
+function ENVIRONMENT_IS_MAIN_THREAD() {
+  var envs = [];
+  if (USE_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('||') + '))';
+}