Merge branch 'main' of github.com:emscripten-core/emscripten

Author: google-yfyang

src/lib/libcore.js

@@ -2559,6 +2559,8 @@ function wrapSyscallFunction(x, library, isWasi) {
   post += "}\n";
   post += "dbg(`syscall return: ${ret}`);\n";
   post += "return ret;\n";
+  // Emit dependency to strError() since we added use of it above.
+  library[x + '__deps'].push('$strError');
 #endif
   delete library[x + '__nothrow'];
   var handler = '';

src/lib/libpthread.js

@@ -241,6 +241,9 @@ var LibraryPThread = {
       worker.onmessage = (e) => {
         var d = e['data'];
         var cmd = d.cmd;
+#if PTHREADS_DEBUG
+        dbg(`main thread: received message '${cmd}' from worker. ${d}`);
+#endif
 
         // If this message is intended to a recipient that is not the main
         // thread, forward it to the target thread.
@@ -283,6 +286,13 @@ var LibraryPThread = {
           // Worker wants to postMessage() to itself to implement setImmediate()
           // emulation.
           worker.postMessage(d);
+#if ENVIRONMENT_MAY_BE_NODE
+        } else if (cmd === 'uncaughtException') {
+          // Message handler for Node.js specific out-of-order behavior:
+          // https://github.com/nodejs/node/issues/59617
+          // A pthread sent an uncaught exception event. Re-raise it on the main thread.
+          worker.onerror(d.error);
+#endif
         } else if (cmd === 'callHandler') {
           Module[d.handler](...d.args);
         } else if (cmd) {
@@ -308,6 +318,13 @@ var LibraryPThread = {
       if (ENVIRONMENT_IS_NODE) {
         worker.on('message', (data) => worker.onmessage({ data: data }));
         worker.on('error', (e) => worker.onerror(e));
+
+#if PTHREADS_DEBUG
+        worker.on('exit', (code) => {
+          if (worker.pthread_ptr) dbg(`Worker hosting pthread ${ptrToString(worker.pthread_ptr)} has terminated with code ${code}.`);
+          else dbg(`Worker has terminated with code ${code}.`);
+        });
+#endif
       }
 #endif
 

src/lib/libsyscall.js

@@ -9,9 +9,6 @@ var SyscallsLibrary = {
 #if FILESYSTEM && SYSCALLS_REQUIRE_FILESYSTEM
                    '$PATH',
                    '$FS',
-#endif
-#if SYSCALL_DEBUG
-                   '$strError',
 #endif
   ],
   $SYSCALLS: {

src/runtime_common.js

@@ -40,6 +40,21 @@ if (ENVIRONMENT_IS_NODE && {{{ ENVIRONMENT_IS_WORKER_THREAD() }}}) {
     self: global,
     postMessage: (msg) => parentPort['postMessage'](msg),
   });
+  // Node.js Workers do not pass postMessage()s and uncaught exception events to the parent
+  // thread necessarily in the same order where they were generated in sequential program order.
+  // See https://github.com/nodejs/node/issues/59617
+  // To remedy this, capture all uncaughtExceptions in the Worker, and sequentialize those over
+  // to the same postMessage pipe that other messages use.
+  process.on("uncaughtException", (err) => {
+#if PTHREADS_DEBUG
+    dbg(`uncaughtException on worker thread: ${err.message}`);
+#endif
+    postMessage({ cmd: 'uncaughtException', error: err });
+    // Also shut down the Worker to match the same semantics as if this uncaughtException
+    // handler was not registered.
+    // (n.b. this will not shut down the whole Node.js app process, but just the Worker)
+    process.exit(1);
+  });
 }
 #endif // (PTHREADS || WASM_WORKERS) && (ENVIRONMENT_MAY_BE_NODE && !WASM_ESM_INTEGRATION)
 

system/lib/libc/musl/src/errno/__strerror.h

@@ -71,7 +71,11 @@ E(ENOLCK,       "No locks available")
 
 E(EDEADLK,      "Resource deadlock would occur")
 E(ENOTRECOVERABLE, "State not recoverable")
+#if defined(__EMSCRIPTEN__)
+E(EOWNERDEAD,   "Owner died")
+#else
 E(EOWNERDEAD,   "Previous owner died")
+#endif
 E(ECANCELED,    "Operation canceled")
 E(ENOSYS,       "Function not implemented")
 E(ENOMSG,       "No message of desired type")

test/clang_native.py

@@ -14,6 +14,15 @@
 
 
 def get_native_triple():
+  # On Raspberry Pi 5, the target triple for native compilation must exactly
+  # match 'aarch64-linux-gnu', or clang will not find the native sysroot.
+  # Users on a Pi 5 can set environment variable
+  # EMTEST_NATIVE_COMPILATION_TRIPLE=aarch64-linux-gnu
+  # to be able to override the native triple for Pi 5 compilation.
+  native_compilation_triple = os.getenv('EMTEST_NATIVE_COMPILATION_TRIPLE')
+  if native_compilation_triple:
+    return native_compilation_triple
+
   arch = {
       'aarch64': 'arm64',
       'arm64': 'arm64',

test/code_size/test_codesize_hello_dylink_all.json

@@ -1,7 +1,7 @@
 {
   "a.out.js": 246640,
-  "a.out.nodebug.wasm": 597720,
-  "total": 844360,
+  "a.out.nodebug.wasm": 597718,
+  "total": 844358,
   "sent": [
     "IMG_Init",
     "IMG_Load",

test/code_size/test_codesize_minimal_pthreads.json

@@ -1,10 +1,10 @@
 {
-  "a.out.js": 7499,
-  "a.out.js.gz": 3721,
+  "a.out.js": 7649,
+  "a.out.js.gz": 3768,
   "a.out.nodebug.wasm": 19588,
   "a.out.nodebug.wasm.gz": 9025,
-  "total": 27087,
-  "total_gz": 12746,
+  "total": 27237,
+  "total_gz": 12793,
   "sent": [
     "a (memory)",
     "b (emscripten_get_now)",

test/code_size/test_codesize_minimal_pthreads_memgrowth.json

@@ -1,10 +1,10 @@
 {
-  "a.out.js": 7926,
-  "a.out.js.gz": 3924,
+  "a.out.js": 8076,
+  "a.out.js.gz": 3974,
   "a.out.nodebug.wasm": 19589,
   "a.out.nodebug.wasm.gz": 9025,
-  "total": 27515,
-  "total_gz": 12949,
+  "total": 27665,
+  "total_gz": 12999,
   "sent": [
     "a (memory)",
     "b (emscripten_get_now)",

test/code_size/test_minimal_runtime_code_size_hello_webgl2_wasm.json

@@ -3,8 +3,8 @@
   "a.html.gz": 321,
   "a.js": 4437,
   "a.js.gz": 2281,
-  "a.wasm": 8290,
-  "a.wasm.gz": 5639,
-  "total": 13181,
-  "total_gz": 8241
+  "a.wasm": 8299,
+  "a.wasm.gz": 5645,
+  "total": 13190,
+  "total_gz": 8247
 }