Fix closure errors with MINIMAL_RUNTIME + USE_PTHREADS. NFC. (#14936)

Author: sbc100

emcc.py

@@ -1884,6 +1884,7 @@ def default_setting(name, new_default):
       '_emscripten_tls_init',
       '_pthread_self',
       '_pthread_testcancel',
+      '_exit',
     ]
     # Some of these symbols are using by worker.js but otherwise unreferenced.
     # Because emitDCEGraph only considered the main js file, and not worker.js

src/library_pthread.js

@@ -9,6 +9,7 @@ var LibraryPThread = {
   $PThread__deps: ['_emscripten_thread_init',
                    'emscripten_futex_wake', '$killThread',
                    '$cancelThread', '$cleanupThread',
+                   'exit',
 #if !MINIMAL_RUNTIME
                    '$handleException',
 #endif
@@ -57,7 +58,9 @@ var LibraryPThread = {
       // things.
       PThread['receiveObjectTransfer'] = PThread.receiveObjectTransfer;
       PThread['threadInit'] = PThread.threadInit;
+#if !MINIMAL_RUNTIME
       PThread['setExitStatus'] = PThread.setExitStatus;
+#endif
 #endif
     },
     // Maps pthread_t to pthread info objects
@@ -130,9 +133,11 @@ var LibraryPThread = {
     },
 #endif
 
+#if !MINIMAL_RUNTIME
     setExitStatus: function(status) {
       EXITSTATUS = status;
     },
+#endif
 
     terminateAllThreads: function() {
       for (var t in PThread.pthreads) {
@@ -305,10 +310,10 @@ var LibraryPThread = {
           err("exitProcess requested by worker");
 #endif
 #if MINIMAL_RUNTIME
-          exit(d['returnCode']);
+          _exit(d['returnCode']);
 #else
           try {
-            exit(d['returnCode']);
+            _exit(d['returnCode']);
           } catch (e) {
             handleException(e);
           }

src/minimal_runtime_worker_externs.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-// These externs are needed for MINIMAL_RUNTIME + USE_PTHREADS + !MODULARIZE
+// These externs are needed for MINIMAL_RUNTIME + USE_PTHREADS
 // This file should go away in the future when worker.js is refactored to live inside the JS module.
 
 var ENVIRONMENT_IS_PTHREAD;

src/preamble_minimal.js

@@ -108,7 +108,7 @@ if (!ENVIRONMENT_IS_PTHREAD) {
 #if USE_PTHREADS
 } else {
 #if MODULARIZE
-  updateGlobalBufferAndViews({{{EXPORT_NAME}}}.buffer);
+  updateGlobalBufferAndViews(Module.buffer);
 #else
   updateGlobalBufferAndViews(wasmMemory.buffer);
 #endif

src/shell_minimal.js

@@ -32,7 +32,7 @@ var ENVIRONMENT_IS_NODE = typeof process === 'object';
 var ENVIRONMENT_IS_SHELL = typeof read === 'function';
 #endif
 
-#if ASSERTIONS
+#if ASSERTIONS || USE_PTHREADS
 #if !ENVIRONMENT_MAY_BE_NODE && !ENVIRONMENT_MAY_BE_SHELL
 var ENVIRONMENT_IS_WEB = true
 #elif ENVIRONMENT && !ENVIRONMENT.includes(',')
@@ -43,10 +43,8 @@ var ENVIRONMENT_IS_WEB = !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_SHELL;
 var ENVIRONMENT_IS_WEB = !ENVIRONMENT_IS_SHELL;
 #else
 var ENVIRONMENT_IS_WEB = !ENVIRONMENT_IS_NODE;
-#else
-
 #endif
-#endif // ASSERTIONS
+#endif // ASSERTIONS || USE_PTHREADS
 
 #if ASSERTIONS && ENVIRONMENT_MAY_BE_NODE && ENVIRONMENT_MAY_BE_SHELL
 if (ENVIRONMENT_IS_NODE && ENVIRONMENT_IS_SHELL) {

tests/test_browser.py

@@ -4701,11 +4701,12 @@ def test_pthread_hello_thread(self, opts):
   # Tests that a pthreads build of -s MINIMAL_RUNTIME=1 works well in different build modes
   @parameterized({
     '': ([],),
-    'O3': (['-O3'],)
+    'modularize': (['-sMODULARIZE', '-sEXPORT_NAME=MyModule'],),
+    'O3': (['-O3'],),
+    'O3_modularize': (['-O3', '-sMODULARIZE', '-sEXPORT_NAME=MyModule'],),
   })
   def test_minimal_runtime_hello_thread(self, opts):
-    for modularize in [[], ['-s', 'MODULARIZE', '-s', 'EXPORT_NAME=MyModule']]:
-      self.btest_exit(test_file('pthread/hello_thread.c'), expected='1', args=['-s', 'MINIMAL_RUNTIME', '-s', 'USE_PTHREADS'] + modularize + opts)
+    self.btest_exit(test_file('pthread/hello_thread.c'), expected='1', args=['--closure=1', '-sMINIMAL_RUNTIME', '-sUSE_PTHREADS'] + opts)
 
   # Tests memory growth in pthreads mode, but still on the main thread.
   @requires_threads

tools/building.py

@@ -834,7 +834,7 @@ def add_to_path(dirname):
   if settings.DYNCALLS:
     CLOSURE_EXTERNS += [path_from_root('src/closure-externs/dyncall-externs.js')]
 
-  if settings.MINIMAL_RUNTIME and settings.USE_PTHREADS and not settings.MODULARIZE:
+  if settings.MINIMAL_RUNTIME and settings.USE_PTHREADS:
     CLOSURE_EXTERNS += [path_from_root('src/minimal_runtime_worker_externs.js')]
 
   args = ['--compilation_level', 'ADVANCED_OPTIMIZATIONS' if advanced else 'SIMPLE_OPTIMIZATIONS']