Move code from worker.js in library_pthread.js invokeEntryPoint (#17087)

This is good for code size and means we can perhaps export fewer
symbols to the worker in future.

Author: sbc100

src/library_pthread.js

@@ -31,9 +31,12 @@ var LibraryPThread = {
   $PThread__deps: ['_emscripten_thread_init',
                    '$killThread',
                    '$cancelThread', '$cleanupThread', '$zeroMemory',
-                   '$ptrToString', '$spawnThread',
+                   '$spawnThread',
                    '_emscripten_thread_free_data',
                    'exit',
+#if PTHREADS_DEBUG || ASSERTIONS
+                   '$ptrToString',
+#endif
 #if !MINIMAL_RUNTIME
                    '$handleException',
 #endif
@@ -979,6 +982,7 @@ var LibraryPThread = {
 #endif
   },
 
+  $invokeEntryPoint__deps: ['_emscripten_thread_exit'],
   $invokeEntryPoint: function(ptr, arg) {
 #if PTHREADS_DEBUG
     err('invokeEntryPoint: ' + ptrToString(ptr));
@@ -989,7 +993,31 @@ var LibraryPThread = {
     // in sync and might not contain the function pointer `ptr` at all.
     __emscripten_thread_sync_code();
 #endif
-    return {{{ makeDynCall('ii', 'ptr') }}}(arg);
+    // pthread entry points are always of signature 'void *ThreadMain(void *arg)'
+    // Native codebases sometimes spawn threads with other thread entry point
+    // signatures, such as void ThreadMain(void *arg), void *ThreadMain(), or
+    // void ThreadMain().  That is not acceptable per C/C++ specification, but
+    // x86 compiler ABI extensions enable that to work. If you find the
+    // following line to crash, either change the signature to "proper" void
+    // *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);
+#if STACK_OVERFLOW_CHECK
+    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);
+    }
+#endif
   },
 
   $executeNotifiedProxyingQueue: function(queue) {

src/worker.js

@@ -232,33 +232,7 @@ self.onmessage = (e) => {
       }
 
       try {
-        // pthread entry points are always of signature 'void *ThreadMain(void *arg)'
-        // Native codebases sometimes spawn threads with other thread entry point signatures,
-        // such as void ThreadMain(void *arg), void *ThreadMain(), or void ThreadMain().
-        // That is not acceptable per C/C++ specification, but x86 compiler ABI extensions
-        // enable that to work. If you find the following line to crash, either change the signature
-        // to "proper" void *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 = Module['invokeEntryPoint'](e.data.start_routine, e.data.arg);
-
-#if STACK_OVERFLOW_CHECK
-        Module['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.
-        // The thread might have finished without calling pthread_exit(). If so,
-        // then perform the exit operation ourselves.
-        // (This is a no-op if explicit pthread_exit() had been called prior.)
-        Module['__emscripten_thread_exit'](result);
-#else
-        if (Module['keepRuntimeAlive']()) {
-          Module['PThread'].setExitStatus(result);
-        } else {
-          Module['__emscripten_thread_exit'](result);
-        }
-#endif
+        Module['invokeEntryPoint'](e.data.start_routine, e.data.arg);
       } catch(ex) {
         if (ex != 'unwind') {
           // ExitStatus not present in MINIMAL_RUNTIME

tests/other/metadce/test_metadce_minimal_pthreads.jssize

@@ -1 +1 @@
-16236
+16127