Merge branch 'main' into chmod-not-update-mtim

Author: hoodmane

.circleci/config.yml

@@ -799,6 +799,7 @@ jobs:
       EMTEST_SKIP_NODE_CANARY: "1"
       EMTEST_SKIP_RUST: "1"
       EMTEST_SKIP_WASM64: "1"
+      EMTEST_SKIP_NEW_CMAKE: "1"
     steps:
       - install-rust
       - run: apt-get install -q -y ninja-build scons ccache

ChangeLog.md

@@ -18,8 +18,11 @@ to browse the changes between the tags.
 
 See docs/process.md for more on how version tagging works.
 
-3.1.73 (in development)
+3.1.74 (in development)
 -----------------------
+
+3.1.73 - 11/28/24
+-----------------
 - libunwind was updated to LLVM 19.1.4. (#22394)
 - mimalloc was updated to 2.1.7. (#21548)
 - The file system was updated to independently track atime, mtime and ctime

cmake/Modules/Platform/Emscripten.cmake

@@ -279,6 +279,10 @@ set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
 set(CMAKE_C_RESPONSE_FILE_LINK_FLAG "@")
 set(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "@")
 
+# Enable $<LINK_LIBRARY:WHOLE_ARCHIVE,static_lib> for CMake 3.24+
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "-Wl,--whole-archive" "<LINK_ITEM>" "-Wl,--no-whole-archive")
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED True)
+
 # Set a global EMSCRIPTEN variable that can be used in client CMakeLists.txt to
 # detect when building using Emscripten.
 set(EMSCRIPTEN 1 CACHE INTERNAL "If true, we are targeting Emscripten output.")

emscripten-version.txt

@@ -1 +1 @@
-3.1.73-git
+3.1.74-git

src/library.js

@@ -2182,25 +2182,19 @@ addToLibrary({
   },
 
   $asyncLoad__docs: '/** @param {boolean=} noRunDep */',
-  $asyncLoad: (url, onload, onerror, noRunDep) => {
-    var dep = !noRunDep ? getUniqueRunDependency(`al ${url}`) : '';
-    readAsync(url).then(
-      (arrayBuffer) => {
-#if ASSERTIONS
-        assert(arrayBuffer, `Loading data file "${url}" failed (no arrayBuffer).`);
-#endif
-        onload(new Uint8Array(arrayBuffer));
-        if (dep) removeRunDependency(dep);
-      },
-      (err) => {
-        if (onerror) {
-          onerror();
-        } else {
-          throw `Loading data file "${url}" failed.`;
-        }
-      }
-    );
-    if (dep) addRunDependency(dep);
+  $asyncLoad: (url, noRunDep) => {
+    return new Promise((resolve, reject) => {
+      var dep = !noRunDep ? getUniqueRunDependency(`al ${url}`) : '';
+      if (dep) addRunDependency(dep);
+      readAsync(url).then(
+        (arrayBuffer) => {
+  #if ASSERTIONS
+          assert(arrayBuffer, `Loading data file "${url}" failed (no arrayBuffer).`);
+  #endif
+          resolve(new Uint8Array(arrayBuffer));
+          if (dep) removeRunDependency(dep);
+        }, reject);
+    });
   },
 
   $alignMemory: (size, alignment) => {

src/library_async.js

@@ -470,7 +470,8 @@ addToLibrary({
   emscripten_wget_data__async: true,
   emscripten_wget_data: (url, pbuffer, pnum, perror) => {
     return Asyncify.handleSleep((wakeUp) => {
-      asyncLoad(UTF8ToString(url), (byteArray) => {
+      /* no need for run dependency, this is async but will not do any prepare etc. step */
+      asyncLoad(UTF8ToString(url), /*noRunDep=*/true).then((byteArray) => {
         // can only allocate the buffer after the wakeUp, not during an asyncing
         var buffer = _malloc(byteArray.length); // must be freed by caller!
         HEAPU8.set(byteArray, buffer);
@@ -481,7 +482,7 @@ addToLibrary({
       }, () => {
         {{{ makeSetValue('perror',  0, '1', 'i32') }}};
         wakeUp();
-      }, true /* no need for run dependency, this is async but will not do any prepare etc. step */ );
+      });
     });
   },
 

src/library_dylink.js

@@ -1024,7 +1024,7 @@ var LibraryDylink = {
 
       var libFile = locateFile(libName);
       if (flags.loadAsync) {
-        return new Promise((resolve, reject) => asyncLoad(libFile, resolve, reject));
+        return asyncLoad(libFile);
       }
 
       // load the binary synchronously

src/library_fs.js

@@ -175,60 +175,46 @@ FS.staticInit();
       path = PATH_FS.resolve(path);
 
       if (!path) return { path: '', node: null };
+      opts.follow_mount ??= true
 
-      var defaults = {
-        follow_mount: true,
-        recurse_count: 0
-      };
-      opts = Object.assign(defaults, opts)
-
-      if (opts.recurse_count > 8) {  // max recursive lookup of 8
-        throw new FS.ErrnoError({{{ cDefs.ELOOP }}});
-      }
+      // limit max consecutive symlinks to 40 (SYMLOOP_MAX).
+      linkloop: for (var nlinks = 0; nlinks < 40; nlinks++) {
+        // split the absolute path
+        var parts = path.split('/').filter((p) => !!p);
 
-      // split the absolute path
-      var parts = path.split('/').filter((p) => !!p);
+        // start at the root
+        var current = FS.root;
+        var current_path = '/';
 
-      // start at the root
-      var current = FS.root;
-      var current_path = '/';
-
-      for (var i = 0; i < parts.length; i++) {
-        var islast = (i === parts.length-1);
-        if (islast && opts.parent) {
-          // stop resolving
-          break;
-        }
+        for (var i = 0; i < parts.length; i++) {
+          var islast = (i === parts.length-1);
+          if (islast && opts.parent) {
+            // stop resolving
+            break;
+          }
 
-        current = FS.lookupNode(current, parts[i]);
-        current_path = PATH.join2(current_path, parts[i]);
+          current = FS.lookupNode(current, parts[i]);
+          current_path = PATH.join2(current_path, parts[i]);
 
-        // jump to the mount's root node if this is a mountpoint
-        if (FS.isMountpoint(current)) {
-          if (!islast || (islast && opts.follow_mount)) {
+          // jump to the mount's root node if this is a mountpoint
+          if (FS.isMountpoint(current) && (!islast || opts.follow_mount)) {
             current = current.mounted.root;
           }
-        }
-
-        // by default, lookupPath will not follow a symlink if it is the final path component.
-        // setting opts.follow = true will override this behavior.
-        if (!islast || opts.follow) {
-          var count = 0;
-          while (FS.isLink(current.mode)) {
-            var link = FS.readlink(current_path);
-            current_path = PATH_FS.resolve(PATH.dirname(current_path), link);
 
-            var lookup = FS.lookupPath(current_path, { recurse_count: opts.recurse_count + 1 });
-            current = lookup.node;
-
-            if (count++ > 40) {  // limit max consecutive symlinks to 40 (SYMLOOP_MAX).
-              throw new FS.ErrnoError({{{ cDefs.ELOOP }}});
+          // by default, lookupPath will not follow a symlink if it is the final path component.
+          // setting opts.follow = true will override this behavior.
+          if (FS.isLink(current.mode) && (!islast || opts.follow)) {
+            if (!current.node_ops.readlink) {
+              throw new FS.ErrnoError({{{ cDefs.ENOSYS }}});
             }
+            var link = current.node_ops.readlink(current);
+            path = PATH_FS.resolve(PATH.dirname(current_path), link, ...parts.slice(i + 1));
+            continue linkloop;
           }
         }
+        return { path: current_path, node: current };
       }
-
-      return { path: current_path, node: current };
+      throw new FS.ErrnoError({{{ cDefs.ELOOP }}});
     },
     getPath(node) {
       var path;
@@ -373,6 +359,9 @@ FS.staticInit();
       return 0;
     },
     mayCreate(dir, name) {
+      if (!FS.isDir(dir.mode)) {
+        return {{{ cDefs.ENOTDIR }}};
+      }
       try {
         var node = FS.lookupNode(dir, name);
         return {{{ cDefs.EEXIST }}};

src/library_fs_shared.js

@@ -76,7 +76,7 @@ addToLibrary({
     }
     addRunDependency(dep);
     if (typeof url == 'string') {
-      asyncLoad(url, processData, onerror);
+      asyncLoad(url).then(processData, onerror);
     } else {
       processData(url);
     }

src/library_pthread.js

@@ -1000,7 +1000,7 @@ var LibraryPThread = {
   },
 
   $establishStackSpace__internal: true,
-  $establishStackSpace__deps: ['$stackRestore'],
+  $establishStackSpace__deps: ['$stackRestore', 'emscripten_stack_set_limits'],
   $establishStackSpace: (pthread_ptr) => {
 #if ALLOW_MEMORY_GROWTH
     // If memory growth is enabled, the memory views may have gotten out of date,