Merge branch 'main' into update_libcxx_libcxxabi_19

Author: aheejin

src/closure-externs/node-externs.js

@@ -119,3 +119,15 @@ fs.Stats.prototype.mtimeMs;
  * @type {number}
  */
 fs.Stats.prototype.ctimeMs;
+
+/**
+ * @param {string} p
+ * @return {boolean}
+ * @nosideeffects
+ */
+path.isAbsolute;
+
+/**
+ * @type {Object.<string,*>}
+ */
+path.posix;

src/library_fs.js

@@ -193,8 +193,18 @@ FS.staticInit();
             break;
           }
 
-          current = FS.lookupNode(current, parts[i]);
           current_path = PATH.join2(current_path, parts[i]);
+          try {
+            current = FS.lookupNode(current, parts[i]);
+          } catch (e) {
+            // if noent_okay is true, suppress a ENOENT in the last component
+            // and return an object with an undefined node. This is needed for
+            // resolving symlinks in the path when creating a file.
+            if ((e?.errno === {{{ cDefs.ENOENT }}}) && islast && opts.noent_okay) {
+              return { path: current_path };
+            }
+            throw e;
+          }
 
           // jump to the mount's root node if this is a mountpoint
           if (FS.isMountpoint(current) && (!islast || opts.follow_mount)) {
@@ -1036,14 +1046,15 @@ FS.staticInit();
         node = path;
       } else {
         path = PATH.normalize(path);
-        try {
-          var lookup = FS.lookupPath(path, {
-            follow: !(flags & {{{ cDefs.O_NOFOLLOW }}})
-          });
-          node = lookup.node;
-        } catch (e) {
-          // ignore
-        }
+        // noent_okay makes it so that if the final component of the path
+        // doesn't exist, lookupPath returns `node: undefined`. `path` will be
+        // updated to point to the target of all symlinks.
+        var lookup = FS.lookupPath(path, {
+          follow: !(flags & {{{ cDefs.O_NOFOLLOW }}}),
+          noent_okay: true
+        });
+        node = lookup.node;
+        path = lookup.path;
       }
       // perhaps we need to create the node
       var created = false;

src/library_memfs.js

@@ -191,18 +191,18 @@ addToLibrary({
         return MEMFS.createNode(parent, name, mode, dev);
       },
       rename(old_node, new_dir, new_name) {
-        // if we're overwriting a directory at new_name, make sure it's empty.
-        if (FS.isDir(old_node.mode)) {
-          var new_node;
-          try {
-            new_node = FS.lookupNode(new_dir, new_name);
-          } catch (e) {
-          }
-          if (new_node) {
+        var new_node;
+        try {
+          new_node = FS.lookupNode(new_dir, new_name);
+        } catch (e) {}
+        if (new_node) {
+          if (FS.isDir(old_node.mode)) {
+            // if we're overwriting a directory at new_name, make sure it's empty.
             for (var i in new_node.contents) {
               throw new FS.ErrnoError({{{ cDefs.ENOTEMPTY }}});
             }
           }
+          FS.hashRemoveNode(new_node);
         }
         // do the internal rewiring
         delete old_node.parent.contents[old_node.name];
@@ -223,11 +223,7 @@ addToLibrary({
         parent.ctime = parent.mtime = Date.now();
       },
       readdir(node) {
-        var entries = ['.', '..'];
-        for (var key of Object.keys(node.contents)) {
-          entries.push(key);
-        }
-        return entries;
+        return ['.', '..', ...Object.keys(node.contents)];
       },
       symlink(parent, newname, oldpath) {
         var node = MEMFS.createNode(parent, newname, 0o777 | {{{ cDefs.S_IFLNK }}}, 0);

src/library_nodefs.js

@@ -197,6 +197,9 @@ addToLibrary({
       rename(oldNode, newDir, newName) {
         var oldPath = NODEFS.realPath(oldNode);
         var newPath = PATH.join2(NODEFS.realPath(newDir), newName);
+        try {
+          FS.unlink(newPath);
+        } catch(e) {}
         NODEFS.tryFSOperation(() => fs.renameSync(oldPath, newPath));
         oldNode.name = newName;
       },

src/library_nodepath.js

@@ -12,23 +12,23 @@
 // operations. Hence, using `nodePath` should be safe here.
 
 addToLibrary({
-  $PATH: {
-    isAbs: (path) => nodePath['isAbsolute'](path),
-    normalize: (path) => nodePath['normalize'](path),
-    dirname: (path) => nodePath['dirname'](path),
-    basename: (path) => nodePath['basename'](path),
-    join: (...args) => nodePath['join'](...args),
-    join2: (l, r) => nodePath['join'](l, r),
-  },
+  $PATH: `{
+    isAbs: nodePath.isAbsolute,
+    normalize: nodePath.normalize,
+    dirname: nodePath.dirname,
+    basename: nodePath.basename,
+    join: nodePath.join,
+    join2: nodePath.join,
+  }`,
   // The FS-using parts are split out into a separate object, so simple path
   // usage does not require the FS.
   $PATH_FS__deps: ['$FS'],
   $PATH_FS__docs: '/** @type{{resolve: function(...*)}} */',
   $PATH_FS: {
     resolve: (...paths) => {
       paths.unshift(FS.cwd());
-      return nodePath['posix']['resolve'](...paths);
+      return nodePath.posix.resolve(...paths);
     },
-    relative: (from, to) => nodePath['posix']['relative'](from || FS.cwd(), to || FS.cwd()),
+    relative: (from, to) => nodePath.posix.relative(from || FS.cwd(), to || FS.cwd()),
   }
 });

src/library_noderawfs.js

@@ -40,7 +40,7 @@ addToLibrary({
     },
     lookupPath(path, opts = {}) {
       if (opts.parent) {
-        path = nodePath.dirname(path);
+        path = PATH.dirname(path);
       }
       var st = fs.lstatSync(path);
       var mode = NODEFS.getMode(path);

src/node_shell_read.js

@@ -5,9 +5,8 @@
  */
 
 readBinary = (filename) => {
-  // We need to re-wrap `file://` strings to URLs. Normalizing isn't
-  // necessary in that case, the path should already be absolute.
-  filename = isFileURI(filename) ? new URL(filename) : nodePath.normalize(filename);
+  // We need to re-wrap `file://` strings to URLs.
+  filename = isFileURI(filename) ? new URL(filename) : filename;
   var ret = fs.readFileSync(filename);
 #if ASSERTIONS
   assert(ret.buffer);
@@ -17,7 +16,7 @@ readBinary = (filename) => {
 
 readAsync = (filename, binary = true) => {
   // See the comment in the `readBinary` function.
-  filename = isFileURI(filename) ? new URL(filename) : nodePath.normalize(filename);
+  filename = isFileURI(filename) ? new URL(filename) : filename;
   return new Promise((resolve, reject) => {
     fs.readFile(filename, binary ? undefined : 'utf8', (err, data) => {
       if (err) reject(err);

test/benchmark/benchmark_utf16.cpp

@@ -54,7 +54,6 @@ unsigned short *randomString(int len) {
 }
 
 int main() {
-  srand(time(NULL));
   double t = 0;
   double t2 = emscripten_get_now();
   for(int i = 0; i < 10; ++i) {

test/benchmark/benchmark_utf8.c

@@ -54,9 +54,6 @@ char *randomString(int len) {
 }
 
 int main() {
-  time_t seed = time(NULL);
-  printf("Random seed: %lld\n", seed);
-  srand(seed);
   double t = 0;
   double t2 = emscripten_get_now();
   for (int i = 0; i < 100000; ++i) {

test/code_size/random_printf_wasm.json

@@ -1,6 +1,6 @@
 {
-  "a.html": 12686,
-  "a.html.gz": 6930,
-  "total": 12686,
-  "total_gz": 6930
+  "a.html": 12597,
+  "a.html.gz": 6882,
+  "total": 12597,
+  "total_gz": 6882
 }