Fix compiler crash on misuse of WASM_WORKERS (#22176)

Fixes: #22175

Author: sbc100

embuilder.py

@@ -33,8 +33,10 @@
     'libbulkmemory',
     'libcompiler_rt',
     'libcompiler_rt-wasm-sjlj',
+    'libcompiler_rt-ww',
     'libc',
     'libc-debug',
+    'libc-ww-debug',
     'libc_optz',
     'libc_optz-debug',
     'libc++abi',
@@ -43,13 +45,16 @@
     'libc++abi-debug',
     'libc++abi-debug-except',
     'libc++abi-debug-noexcept',
+    'libc++abi-debug-ww-noexcept',
     'libc++',
     'libc++-except',
     'libc++-noexcept',
+    'libc++-ww-noexcept',
     'libal',
     'libdlmalloc',
     'libdlmalloc-tracing',
     'libdlmalloc-debug',
+    'libdlmalloc-ww',
     'libembind',
     'libembind-rtti',
     'libemmalloc',
@@ -63,8 +68,10 @@
     'libGL-getprocaddr',
     'libGL-emu-webgl2-ofb-getprocaddr',
     'libGL-webgl2-ofb-getprocaddr',
+    'libGL-ww-getprocaddr',
     'libhtml5',
     'libsockets',
+    'libsockets-ww',
     'libstubs',
     'libstubs-debug',
     'libstandalonewasm-nocatch',

src/library_wasm_worker.js

@@ -20,19 +20,16 @@
 #error "Internal error! SHARED_MEMORY should be enabled when building with WASM_WORKERS"
 #endif
 #if SINGLE_FILE
-#error "-sSINGLE_FILE is not supported with -sWASM_WORKERS!"
+#error "-sSINGLE_FILE is not supported with -sWASM_WORKERS"
 #endif
 #if LINKABLE
-#error "-sLINKABLE is not supported with -sWASM_WORKERS!"
+#error "-sLINKABLE is not supported with -sWASM_WORKERS"
 #endif
-#if SIDE_MODULE
-#error "-sSIDE_MODULE is not supported with -sWASM_WORKERS!"
-#endif
-#if MAIN_MODULE
-#error "-sMAIN_MODULE is not supported with -sWASM_WORKERS!"
+#if RELOCATABLE
+#error "dynamic linking is not supported with -sWASM_WORKERS"
 #endif
 #if PROXY_TO_WORKER
-#error "-sPROXY_TO_WORKER is not supported with -sWASM_WORKERS!"
+#error "-sPROXY_TO_WORKER is not supported with -sWASM_WORKERS"
 #endif
 
 #endif // ~WASM_WORKERS

test/test_other.py

@@ -13840,6 +13840,14 @@ def test_debug_opt_warning(self, should_fail, args):
   def test_wasm_worker_closure(self):
     self.run_process([EMCC, test_file('wasm_worker/lock_async_acquire.c'), '-O2', '-sWASM_WORKERS', '--closure=1'])
 
+  def test_wasm_worker_errors(self):
+    err = self.expect_fail([EMCC, test_file('hello_world.c'), '-sWASM_WORKERS', '-sSINGLE_FILE'])
+    self.assertContained('-sSINGLE_FILE is not supported with -sWASM_WORKERS', err)
+    err = self.expect_fail([EMCC, test_file('hello_world.c'), '-sWASM_WORKERS', '-sPROXY_TO_WORKER'])
+    self.assertContained('-sPROXY_TO_WORKER is not supported with -sWASM_WORKERS', err)
+    err = self.expect_fail([EMCC, test_file('hello_world.c'), '-sWASM_WORKERS', '-sRELOCATABLE'])
+    self.assertContained('dynamic linking is not supported with -sWASM_WORKERS', err)
+
   def test_clock_nanosleep(self):
     self.do_runf('other/test_clock_nanosleep.c')
 

tools/system_libs.py

@@ -2384,7 +2384,9 @@ def add_sanitizer_libs():
     if settings.LINK_AS_CXX:
       add_library('libwebgpu_cpp')
 
-  if settings.WASM_WORKERS:
+  if settings.WASM_WORKERS and (not settings.SINGLE_FILE and
+                                not settings.RELOCATABLE and
+                                not settings.PROXY_TO_WORKER):
     add_library('libwasm_workers')
 
   if settings.WASMFS: