Move more code out of worker.js

Followup to #17087.

Author: sbc100

src/library.js

@@ -3422,23 +3422,33 @@ mergeInto(LibraryManager.library, {
     throw UTF8ToString(str);
   },
 
-#if !MINIMAL_RUNTIME
   $handleException: function(e) {
     // Certain exception types we do not treat as errors since they are used for
     // internal control flow.
     // 1. ExitStatus, which is thrown by exit()
     // 2. "unwind", which is thrown by emscripten_unwind_to_js_event_loop() and others
     //    that wish to return to JS event loop.
+#if MINIMAL_RUNTIME
+    if (e != 'unwind') {
+      throw e;
+    }
+#else
     if (e instanceof ExitStatus || e == 'unwind') {
       return EXITSTATUS;
     }
-#if MINIMAL_RUNTIME
-    throw e;
-#else
+#if USE_PTHREADS
+    if (ENVIRONMENT_IS_PTHREAD) {
+      // In pthreads we allow exceptions to flow all the way
+      // out the top level where the top-level handler reports
+      // them back the main thread.
+      throw e;
+    }
+#endif
     quit_(1, e);
 #endif
   },
 
+#if !MINIMAL_RUNTIME
   // Callable in pthread without __proxy needed.
   $runtimeKeepalivePush__sig: 'v',
   $runtimeKeepalivePush: function() {

src/library_pthread.js

@@ -806,25 +806,17 @@ var LibraryPThread = {
   // that the entire process should exit.
   // This function is always called from a pthread, but is executed on the
   // main thread due the __proxy attribute.
-  $exitOnMainThread__deps: ['exit',
-#if !MINIMAL_RUNTIME
-    '$handleException',
-#endif
-  ],
+  $exitOnMainThread__deps: ['exit', '$handleException'],
   $exitOnMainThread__proxy: 'async',
   $exitOnMainThread: function(returnCode) {
 #if PTHREADS_DEBUG
     err('exitOnMainThread');
 #endif
-#if MINIMAL_RUNTIME
-    _exit(returnCode);
-#else
     try {
       _exit(returnCode);
     } catch (e) {
       handleException(e);
     }
-#endif
   },
 
   emscripten_proxy_to_main_thread_js__deps: ['$withStackSave', 'emscripten_run_in_main_runtime_thread_js'],
@@ -952,7 +944,7 @@ var LibraryPThread = {
 #endif
   },
 
-  $invokeEntryPoint__deps: ['_emscripten_thread_exit'],
+  $invokeEntryPoint__deps: ['$handleException'],
   $invokeEntryPoint: function(ptr, arg) {
 #if PTHREADS_DEBUG
     err('invokeEntryPoint: ' + ptrToString(ptr));
@@ -972,22 +964,23 @@ var LibraryPThread = {
     // *ThreadMain(void *arg) form, or try linking with the Emscripten linker
     // flag -sEMULATE_FUNCTION_POINTER_CASTS to add in emulation for this x86
     // ABI extension.
-    var result = {{{ makeDynCall('ii', 'ptr') }}}(arg);
+    try {
+      var result = {{{ makeDynCall('ii', 'ptr') }}}(arg);
 #if STACK_OVERFLOW_CHECK
-    checkStackCookie();
+      checkStackCookie();
 #endif
 #if MINIMAL_RUNTIME
-    // In MINIMAL_RUNTIME the noExitRuntime concept does not apply to
-    // pthreads. To exit a pthread with live runtime, use the function
-    // emscripten_unwind_to_js_event_loop() in the pthread body.
-    __emscripten_thread_exit(result);
-#else
-    if (keepRuntimeAlive()) {
-      PThread.setExitStatus(result);
-    } else {
       __emscripten_thread_exit(result);
-    }
+#else
+      if (keepRuntimeAlive()) {
+        PThread.setExitStatus(result);
+      } else {
+        __emscripten_thread_exit(result);
+      }
 #endif
+    } catch (e) {
+      handleException(e);
+    }
   },
 
   $executeNotifiedProxyingQueue: function(queue) {

src/worker.js

@@ -238,39 +238,7 @@ self.onmessage = (e) => {
         initializedJS = true;
       }
 
-      try {
-        Module['invokeEntryPoint'](e.data.start_routine, e.data.arg);
-      } catch(ex) {
-        if (ex != 'unwind') {
-          // ExitStatus not present in MINIMAL_RUNTIME
-#if !MINIMAL_RUNTIME
-          if (ex instanceof Module['ExitStatus']) {
-            if (Module['keepRuntimeAlive']()) {
-#if ASSERTIONS
-              err('Pthread 0x' + Module['_pthread_self']().toString(16) + ' called exit(), staying alive due to noExitRuntime.');
-#endif
-            } else {
-#if ASSERTIONS
-              err('Pthread 0x' + Module['_pthread_self']().toString(16) + ' called exit(), calling _emscripten_thread_exit.');
-#endif
-              Module['__emscripten_thread_exit'](ex.status);
-            }
-          }
-          else
-#endif // !MINIMAL_RUNTIME
-          {
-            // The pthread "crashed".  Do not call `_emscripten_thread_exit` (which
-            // would make this thread joinable.  Instead, re-throw the exception
-            // and let the top level handler propagate it back to the main thread.
-            throw ex;
-          }
-#if ASSERTIONS
-        } else {
-          // else e == 'unwind', and we should fall through here and keep the pthread alive for asynchronous events.
-          err('Pthread 0x' + Module['_pthread_self']().toString(16) + ' completed its main entry point with an `unwind`, keeping the worker alive for asynchronous operation.');
-#endif
-        }
-      }
+      Module['invokeEntryPoint'](e.data.start_routine, e.data.arg);
     } else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread.
       if (Module['_pthread_self']()) {
         Module['__emscripten_thread_exit']({{{ cDefine('PTHREAD_CANCELED') }}});