From 16116170c142d026a888842987c963570c2e0ee4 Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Tue, 26 Nov 2024 11:27:17 +0100
Subject: [PATCH 1/7] Remove recursive call

---
 src/library_fs.js | 64 ++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 37 deletions(-)

diff --git a/src/library_fs.js b/src/library_fs.js
index 886efa61f4c45..bdab7c91f2d26 100644
--- a/src/library_fs.js
+++ b/src/library_fs.js
@@ -177,57 +177,47 @@ FS.staticInit();
 
       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 }}});
-      }
-
-      // split the absolute path
-      var parts = path.split('/').filter((p) => !!p);
+      // 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);
 
-      // 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;

From 240e1647d27a469251d4b799b61783aa967f70d6 Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Tue, 26 Nov 2024 20:45:35 +0100
Subject: [PATCH 2/7] Address review comments

---
 src/library_fs.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/library_fs.js b/src/library_fs.js
index bdab7c91f2d26..c00562e368346 100644
--- a/src/library_fs.js
+++ b/src/library_fs.js
@@ -174,14 +174,10 @@ FS.staticInit();
       path = PATH_FS.resolve(path);
 
       if (!path) return { path: '', node: null };
-
-      var defaults = {
-        follow_mount: true,
-      };
-      opts = Object.assign(defaults, opts)
+      opts.follow_mount ??= true
 
       // limit max consecutive symlinks to 40 (SYMLOOP_MAX).
-      linkloop: for (var nlinks = 0; nlinks < 40; nlinks ++) {
+      linkloop: for (var nlinks = 0; nlinks < 40; nlinks++) {
         // split the absolute path
         var parts = path.split('/').filter((p) => !!p);
 

From 05a18421ae1fa38fb15f0349414d34b1cbad4622 Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Tue, 26 Nov 2024 22:02:37 +0100
Subject: [PATCH 3/7] Rebaseline code size

---
 test/code_size/embind_hello_wasm.json                     | 8 ++++----
 test/code_size/embind_val_wasm.json                       | 8 ++++----
 test/code_size/hello_webgl2_wasm.json                     | 4 ++--
 test/code_size/hello_webgl2_wasm2js.json                  | 8 ++++----
 test/code_size/hello_webgl_wasm.json                      | 4 ++--
 test/code_size/hello_webgl_wasm2js.json                   | 8 ++++----
 test/code_size/random_printf_wasm.json                    | 8 ++++----
 test/code_size/random_printf_wasm2js.json                 | 8 ++++----
 test/other/codesize/test_codesize_cxx_ctors1.gzsize       | 2 +-
 test/other/codesize/test_codesize_cxx_ctors1.jssize       | 2 +-
 test/other/codesize/test_codesize_cxx_ctors1.size         | 2 +-
 test/other/codesize/test_codesize_cxx_ctors2.gzsize       | 2 +-
 test/other/codesize/test_codesize_cxx_ctors2.jssize       | 2 +-
 test/other/codesize/test_codesize_cxx_ctors2.size         | 2 +-
 test/other/codesize/test_codesize_cxx_except.gzsize       | 2 +-
 test/other/codesize/test_codesize_cxx_except.jssize       | 2 +-
 test/other/codesize/test_codesize_cxx_except.size         | 2 +-
 test/other/codesize/test_codesize_cxx_except_wasm.gzsize  | 2 +-
 test/other/codesize/test_codesize_cxx_except_wasm.jssize  | 2 +-
 test/other/codesize/test_codesize_cxx_except_wasm.size    | 2 +-
 .../codesize/test_codesize_cxx_except_wasm_exnref.gzsize  | 2 +-
 .../codesize/test_codesize_cxx_except_wasm_exnref.jssize  | 2 +-
 .../codesize/test_codesize_cxx_except_wasm_exnref.size    | 2 +-
 test/other/codesize/test_codesize_cxx_lto.gzsize          | 2 +-
 test/other/codesize/test_codesize_cxx_lto.jssize          | 2 +-
 test/other/codesize/test_codesize_cxx_lto.size            | 2 +-
 test/other/codesize/test_codesize_cxx_mangle.gzsize       | 2 +-
 test/other/codesize/test_codesize_cxx_mangle.jssize       | 2 +-
 test/other/codesize/test_codesize_cxx_mangle.size         | 2 +-
 test/other/codesize/test_codesize_cxx_noexcept.gzsize     | 2 +-
 test/other/codesize/test_codesize_cxx_noexcept.jssize     | 2 +-
 test/other/codesize/test_codesize_cxx_noexcept.size       | 2 +-
 test/other/codesize/test_codesize_cxx_wasmfs.size         | 2 +-
 test/other/codesize/test_codesize_files_js_fs.gzsize      | 2 +-
 test/other/codesize/test_codesize_files_js_fs.jssize      | 2 +-
 test/other/codesize/test_codesize_files_wasmfs.size       | 2 +-
 test/other/codesize/test_codesize_hello_O0.size           | 2 +-
 test/other/codesize/test_codesize_hello_O1.size           | 2 +-
 test/other/codesize/test_codesize_minimal_O0.size         | 2 +-
 test/other/codesize/test_codesize_minimal_O1.size         | 2 +-
 test/other/codesize/test_codesize_minimal_pthreads.size   | 2 +-
 test/other/test_unoptimized_code_size.wasm.size           | 2 +-
 .../other/test_unoptimized_code_size_no_asserts.wasm.size | 2 +-
 test/other/test_unoptimized_code_size_strict.wasm.size    | 2 +-
 44 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/test/code_size/embind_hello_wasm.json b/test/code_size/embind_hello_wasm.json
index f3b1d73bc6bec..506bbbab2a7e7 100644
--- a/test/code_size/embind_hello_wasm.json
+++ b/test/code_size/embind_hello_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 380,
   "a.js": 9718,
   "a.js.gz": 4291,
-  "a.wasm": 7728,
-  "a.wasm.gz": 3502,
-  "total": 17998,
-  "total_gz": 8173
+  "a.wasm": 7730,
+  "a.wasm.gz": 3507,
+  "total": 18000,
+  "total_gz": 8178
 }
diff --git a/test/code_size/embind_val_wasm.json b/test/code_size/embind_val_wasm.json
index 9af792edee31e..7ab5279b09f23 100644
--- a/test/code_size/embind_val_wasm.json
+++ b/test/code_size/embind_val_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 380,
   "a.js": 6849,
   "a.js.gz": 2947,
-  "a.wasm": 9568,
-  "a.wasm.gz": 4911,
-  "total": 16969,
-  "total_gz": 8238
+  "a.wasm": 9565,
+  "a.wasm.gz": 4904,
+  "total": 16966,
+  "total_gz": 8231
 }
diff --git a/test/code_size/hello_webgl2_wasm.json b/test/code_size/hello_webgl2_wasm.json
index 6a80b58ccd57a..22fd8e4d6a868 100644
--- a/test/code_size/hello_webgl2_wasm.json
+++ b/test/code_size/hello_webgl2_wasm.json
@@ -4,7 +4,7 @@
   "a.js": 4531,
   "a.js.gz": 2312,
   "a.wasm": 10402,
-  "a.wasm.gz": 6704,
+  "a.wasm.gz": 6702,
   "total": 15387,
-  "total_gz": 9344
+  "total_gz": 9342
 }
diff --git a/test/code_size/hello_webgl2_wasm2js.json b/test/code_size/hello_webgl2_wasm2js.json
index 3d8c851127bc8..23821367cd7f3 100644
--- a/test/code_size/hello_webgl2_wasm2js.json
+++ b/test/code_size/hello_webgl2_wasm2js.json
@@ -1,8 +1,8 @@
 {
   "a.html": 346,
   "a.html.gz": 262,
-  "a.js": 22199,
-  "a.js.gz": 11579,
-  "total": 22545,
-  "total_gz": 11841
+  "a.js": 22211,
+  "a.js.gz": 11592,
+  "total": 22557,
+  "total_gz": 11854
 }
diff --git a/test/code_size/hello_webgl_wasm.json b/test/code_size/hello_webgl_wasm.json
index 78cc66760308e..1fde89292c127 100644
--- a/test/code_size/hello_webgl_wasm.json
+++ b/test/code_size/hello_webgl_wasm.json
@@ -4,7 +4,7 @@
   "a.js": 4069,
   "a.js.gz": 2158,
   "a.wasm": 10402,
-  "a.wasm.gz": 6704,
+  "a.wasm.gz": 6702,
   "total": 14925,
-  "total_gz": 9190
+  "total_gz": 9188
 }
diff --git a/test/code_size/hello_webgl_wasm2js.json b/test/code_size/hello_webgl_wasm2js.json
index 1320f0d8bddcf..34f3ca3446b66 100644
--- a/test/code_size/hello_webgl_wasm2js.json
+++ b/test/code_size/hello_webgl_wasm2js.json
@@ -1,8 +1,8 @@
 {
   "a.html": 346,
   "a.html.gz": 262,
-  "a.js": 21725,
-  "a.js.gz": 11413,
-  "total": 22071,
-  "total_gz": 11675
+  "a.js": 21737,
+  "a.js.gz": 11422,
+  "total": 22083,
+  "total_gz": 11684
 }
diff --git a/test/code_size/random_printf_wasm.json b/test/code_size/random_printf_wasm.json
index 2972d5a41da4c..d8ce697429428 100644
--- a/test/code_size/random_printf_wasm.json
+++ b/test/code_size/random_printf_wasm.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 12698,
-  "a.html.gz": 6901,
-  "total": 12698,
-  "total_gz": 6901
+  "a.html": 12694,
+  "a.html.gz": 6898,
+  "total": 12694,
+  "total_gz": 6898
 }
diff --git a/test/code_size/random_printf_wasm2js.json b/test/code_size/random_printf_wasm2js.json
index 4f592a8bb51a2..6a2b6c02f2394 100644
--- a/test/code_size/random_printf_wasm2js.json
+++ b/test/code_size/random_printf_wasm2js.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 17276,
-  "a.html.gz": 7511,
-  "total": 17276,
-  "total_gz": 7511
+  "a.html": 17260,
+  "a.html.gz": 7500,
+  "total": 17260,
+  "total_gz": 7500
 }
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.gzsize b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
index 70461f8a6e739..6f34eceee162a 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
@@ -1 +1 @@
-8450
+8438
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.jssize b/test/other/codesize/test_codesize_cxx_ctors1.jssize
index cfe33a90d39b5..ef30866d142ec 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.jssize
@@ -1 +1 @@
-20797
+20675
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.size b/test/other/codesize/test_codesize_cxx_ctors1.size
index 67d610a7db4b8..6f5d05d80af74 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.size
+++ b/test/other/codesize/test_codesize_cxx_ctors1.size
@@ -1 +1 @@
-129276
+129329
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.gzsize b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
index 3a402b492b0d7..e2bf23cff5d1d 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
@@ -1 +1 @@
-8436
+8420
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.jssize b/test/other/codesize/test_codesize_cxx_ctors2.jssize
index f9b02e898e2f7..8a769a23a53ba 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.jssize
@@ -1 +1 @@
-20765
+20643
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.size b/test/other/codesize/test_codesize_cxx_ctors2.size
index 8649e524047b6..72f45df2e4d3d 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.size
+++ b/test/other/codesize/test_codesize_cxx_ctors2.size
@@ -1 +1 @@
-128722
+128775
diff --git a/test/other/codesize/test_codesize_cxx_except.gzsize b/test/other/codesize/test_codesize_cxx_except.gzsize
index 7eee896173205..54b5a9132e773 100644
--- a/test/other/codesize/test_codesize_cxx_except.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except.gzsize
@@ -1 +1 @@
-9477
+9455
diff --git a/test/other/codesize/test_codesize_cxx_except.jssize b/test/other/codesize/test_codesize_cxx_except.jssize
index 790b94dcc58e4..9a0a588d1fcb0 100644
--- a/test/other/codesize/test_codesize_cxx_except.jssize
+++ b/test/other/codesize/test_codesize_cxx_except.jssize
@@ -1 +1 @@
-24640
+24518
diff --git a/test/other/codesize/test_codesize_cxx_except.size b/test/other/codesize/test_codesize_cxx_except.size
index 4101c1e3f43f1..90c6c55ccfadd 100644
--- a/test/other/codesize/test_codesize_cxx_except.size
+++ b/test/other/codesize/test_codesize_cxx_except.size
@@ -1 +1 @@
-171403
+171454
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
index 6536dd0d80ddf..bca93ddc17add 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
@@ -1 +1 @@
-8419
+8402
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.jssize b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
index bd029fefbea94..370f74007befd 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
@@ -1 +1 @@
-20691
+20569
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.size b/test/other/codesize/test_codesize_cxx_except_wasm.size
index 9cd423f86ea1c..38ab40b967773 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.size
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.size
@@ -1 +1 @@
-142503
+142545
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
index 6536dd0d80ddf..bca93ddc17add 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
@@ -1 +1 @@
-8419
+8402
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
index bd029fefbea94..370f74007befd 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
@@ -1 +1 @@
-20691
+20569
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size
index 1d7e1abae6ec3..515a2ddcbb305 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size
@@ -1 +1 @@
-145140
+145182
diff --git a/test/other/codesize/test_codesize_cxx_lto.gzsize b/test/other/codesize/test_codesize_cxx_lto.gzsize
index c24db41a3eb53..0032be3e0bd21 100644
--- a/test/other/codesize/test_codesize_cxx_lto.gzsize
+++ b/test/other/codesize/test_codesize_cxx_lto.gzsize
@@ -1 +1 @@
-8349
+8331
diff --git a/test/other/codesize/test_codesize_cxx_lto.jssize b/test/other/codesize/test_codesize_cxx_lto.jssize
index 6e2cb31607353..b04d9afec53aa 100644
--- a/test/other/codesize/test_codesize_cxx_lto.jssize
+++ b/test/other/codesize/test_codesize_cxx_lto.jssize
@@ -1 +1 @@
-20376
+20253
diff --git a/test/other/codesize/test_codesize_cxx_lto.size b/test/other/codesize/test_codesize_cxx_lto.size
index 0f54d0629ace8..574c227ad93dd 100644
--- a/test/other/codesize/test_codesize_cxx_lto.size
+++ b/test/other/codesize/test_codesize_cxx_lto.size
@@ -1 +1 @@
-122475
+122490
diff --git a/test/other/codesize/test_codesize_cxx_mangle.gzsize b/test/other/codesize/test_codesize_cxx_mangle.gzsize
index a434caefa3d33..78a8c98744fb2 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.gzsize
+++ b/test/other/codesize/test_codesize_cxx_mangle.gzsize
@@ -1 +1 @@
-9480
+9461
diff --git a/test/other/codesize/test_codesize_cxx_mangle.jssize b/test/other/codesize/test_codesize_cxx_mangle.jssize
index 790b94dcc58e4..9a0a588d1fcb0 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.jssize
+++ b/test/other/codesize/test_codesize_cxx_mangle.jssize
@@ -1 +1 @@
-24640
+24518
diff --git a/test/other/codesize/test_codesize_cxx_mangle.size b/test/other/codesize/test_codesize_cxx_mangle.size
index 586adb4028ee1..2a2edb42981d2 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.size
+++ b/test/other/codesize/test_codesize_cxx_mangle.size
@@ -1 +1 @@
-232914
+232974
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.gzsize b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
index 70461f8a6e739..6f34eceee162a 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.gzsize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
@@ -1 +1 @@
-8450
+8438
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.jssize b/test/other/codesize/test_codesize_cxx_noexcept.jssize
index cfe33a90d39b5..ef30866d142ec 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.jssize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.jssize
@@ -1 +1 @@
-20797
+20675
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.size b/test/other/codesize/test_codesize_cxx_noexcept.size
index ff65c81fe6324..e7b9045cc72fb 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.size
+++ b/test/other/codesize/test_codesize_cxx_noexcept.size
@@ -1 +1 @@
-132080
+132135
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.size b/test/other/codesize/test_codesize_cxx_wasmfs.size
index 8577c65274f9b..cc3549b1b4502 100644
--- a/test/other/codesize/test_codesize_cxx_wasmfs.size
+++ b/test/other/codesize/test_codesize_cxx_wasmfs.size
@@ -1 +1 @@
-169523
+169559
diff --git a/test/other/codesize/test_codesize_files_js_fs.gzsize b/test/other/codesize/test_codesize_files_js_fs.gzsize
index 594e0a236d3a5..7b1db08ddffd2 100644
--- a/test/other/codesize/test_codesize_files_js_fs.gzsize
+++ b/test/other/codesize/test_codesize_files_js_fs.gzsize
@@ -1 +1 @@
-7584
+7564
diff --git a/test/other/codesize/test_codesize_files_js_fs.jssize b/test/other/codesize/test_codesize_files_js_fs.jssize
index 6689ea31bd688..cc1723f891240 100644
--- a/test/other/codesize/test_codesize_files_js_fs.jssize
+++ b/test/other/codesize/test_codesize_files_js_fs.jssize
@@ -1 +1 @@
-18694
+18573
diff --git a/test/other/codesize/test_codesize_files_wasmfs.size b/test/other/codesize/test_codesize_files_wasmfs.size
index 8dbc1b508195f..1d399b854854f 100644
--- a/test/other/codesize/test_codesize_files_wasmfs.size
+++ b/test/other/codesize/test_codesize_files_wasmfs.size
@@ -1 +1 @@
-51157
+51138
diff --git a/test/other/codesize/test_codesize_hello_O0.size b/test/other/codesize/test_codesize_hello_O0.size
index b55e8eb4cd221..6d44e85748746 100644
--- a/test/other/codesize/test_codesize_hello_O0.size
+++ b/test/other/codesize/test_codesize_hello_O0.size
@@ -1 +1 @@
-14531
+14453
diff --git a/test/other/codesize/test_codesize_hello_O1.size b/test/other/codesize/test_codesize_hello_O1.size
index 48c6e93066ff9..1db299c003761 100644
--- a/test/other/codesize/test_codesize_hello_O1.size
+++ b/test/other/codesize/test_codesize_hello_O1.size
@@ -1 +1 @@
-2535
+2460
diff --git a/test/other/codesize/test_codesize_minimal_O0.size b/test/other/codesize/test_codesize_minimal_O0.size
index 37cdd416f157a..4b02a197f603b 100644
--- a/test/other/codesize/test_codesize_minimal_O0.size
+++ b/test/other/codesize/test_codesize_minimal_O0.size
@@ -1 +1 @@
-975
+900
diff --git a/test/other/codesize/test_codesize_minimal_O1.size b/test/other/codesize/test_codesize_minimal_O1.size
index 100000a67875f..d8fc48a4f27cc 100644
--- a/test/other/codesize/test_codesize_minimal_O1.size
+++ b/test/other/codesize/test_codesize_minimal_O1.size
@@ -1 +1 @@
-376
+301
diff --git a/test/other/codesize/test_codesize_minimal_pthreads.size b/test/other/codesize/test_codesize_minimal_pthreads.size
index 10b2d7f643c17..7bdc3813b38a5 100644
--- a/test/other/codesize/test_codesize_minimal_pthreads.size
+++ b/test/other/codesize/test_codesize_minimal_pthreads.size
@@ -1 +1 @@
-19501
+19480
diff --git a/test/other/test_unoptimized_code_size.wasm.size b/test/other/test_unoptimized_code_size.wasm.size
index b55e8eb4cd221..6d44e85748746 100644
--- a/test/other/test_unoptimized_code_size.wasm.size
+++ b/test/other/test_unoptimized_code_size.wasm.size
@@ -1 +1 @@
-14531
+14453
diff --git a/test/other/test_unoptimized_code_size_no_asserts.wasm.size b/test/other/test_unoptimized_code_size_no_asserts.wasm.size
index a65dc9b14619a..e65cafbcc8d8a 100644
--- a/test/other/test_unoptimized_code_size_no_asserts.wasm.size
+++ b/test/other/test_unoptimized_code_size_no_asserts.wasm.size
@@ -1 +1 @@
-11724
+11646
diff --git a/test/other/test_unoptimized_code_size_strict.wasm.size b/test/other/test_unoptimized_code_size_strict.wasm.size
index b55e8eb4cd221..6d44e85748746 100644
--- a/test/other/test_unoptimized_code_size_strict.wasm.size
+++ b/test/other/test_unoptimized_code_size_strict.wasm.size
@@ -1 +1 @@
-14531
+14453

From eb9c2b5370904eb2e889dba817db7b5ed21c5848 Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Tue, 26 Nov 2024 23:01:10 +0100
Subject: [PATCH 4/7] Update changelog

---
 ChangeLog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 0f27fb2734d4a..d66172ab95250 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -21,6 +21,9 @@ See docs/process.md for more on how version tagging works.
 3.1.73 (in development)
 -----------------------
 - 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
+  instead of using the same time for all three.
 
 3.1.72 - 11/19/24
 -----------------

From f0a353cf9c7a8e06933e1731337afde0488ac3de Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Tue, 26 Nov 2024 23:01:24 +0100
Subject: [PATCH 5/7] Revert "Rebaseline code size"

This reverts commit 05a18421ae1fa38fb15f0349414d34b1cbad4622.
---
 test/code_size/embind_hello_wasm.json                     | 8 ++++----
 test/code_size/embind_val_wasm.json                       | 8 ++++----
 test/code_size/hello_webgl2_wasm.json                     | 4 ++--
 test/code_size/hello_webgl2_wasm2js.json                  | 8 ++++----
 test/code_size/hello_webgl_wasm.json                      | 4 ++--
 test/code_size/hello_webgl_wasm2js.json                   | 8 ++++----
 test/code_size/random_printf_wasm.json                    | 8 ++++----
 test/code_size/random_printf_wasm2js.json                 | 8 ++++----
 test/other/codesize/test_codesize_cxx_ctors1.gzsize       | 2 +-
 test/other/codesize/test_codesize_cxx_ctors1.jssize       | 2 +-
 test/other/codesize/test_codesize_cxx_ctors1.size         | 2 +-
 test/other/codesize/test_codesize_cxx_ctors2.gzsize       | 2 +-
 test/other/codesize/test_codesize_cxx_ctors2.jssize       | 2 +-
 test/other/codesize/test_codesize_cxx_ctors2.size         | 2 +-
 test/other/codesize/test_codesize_cxx_except.gzsize       | 2 +-
 test/other/codesize/test_codesize_cxx_except.jssize       | 2 +-
 test/other/codesize/test_codesize_cxx_except.size         | 2 +-
 test/other/codesize/test_codesize_cxx_except_wasm.gzsize  | 2 +-
 test/other/codesize/test_codesize_cxx_except_wasm.jssize  | 2 +-
 test/other/codesize/test_codesize_cxx_except_wasm.size    | 2 +-
 .../codesize/test_codesize_cxx_except_wasm_exnref.gzsize  | 2 +-
 .../codesize/test_codesize_cxx_except_wasm_exnref.jssize  | 2 +-
 .../codesize/test_codesize_cxx_except_wasm_exnref.size    | 2 +-
 test/other/codesize/test_codesize_cxx_lto.gzsize          | 2 +-
 test/other/codesize/test_codesize_cxx_lto.jssize          | 2 +-
 test/other/codesize/test_codesize_cxx_lto.size            | 2 +-
 test/other/codesize/test_codesize_cxx_mangle.gzsize       | 2 +-
 test/other/codesize/test_codesize_cxx_mangle.jssize       | 2 +-
 test/other/codesize/test_codesize_cxx_mangle.size         | 2 +-
 test/other/codesize/test_codesize_cxx_noexcept.gzsize     | 2 +-
 test/other/codesize/test_codesize_cxx_noexcept.jssize     | 2 +-
 test/other/codesize/test_codesize_cxx_noexcept.size       | 2 +-
 test/other/codesize/test_codesize_cxx_wasmfs.size         | 2 +-
 test/other/codesize/test_codesize_files_js_fs.gzsize      | 2 +-
 test/other/codesize/test_codesize_files_js_fs.jssize      | 2 +-
 test/other/codesize/test_codesize_files_wasmfs.size       | 2 +-
 test/other/codesize/test_codesize_hello_O0.size           | 2 +-
 test/other/codesize/test_codesize_hello_O1.size           | 2 +-
 test/other/codesize/test_codesize_minimal_O0.size         | 2 +-
 test/other/codesize/test_codesize_minimal_O1.size         | 2 +-
 test/other/codesize/test_codesize_minimal_pthreads.size   | 2 +-
 test/other/test_unoptimized_code_size.wasm.size           | 2 +-
 .../other/test_unoptimized_code_size_no_asserts.wasm.size | 2 +-
 test/other/test_unoptimized_code_size_strict.wasm.size    | 2 +-
 44 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/test/code_size/embind_hello_wasm.json b/test/code_size/embind_hello_wasm.json
index 506bbbab2a7e7..f3b1d73bc6bec 100644
--- a/test/code_size/embind_hello_wasm.json
+++ b/test/code_size/embind_hello_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 380,
   "a.js": 9718,
   "a.js.gz": 4291,
-  "a.wasm": 7730,
-  "a.wasm.gz": 3507,
-  "total": 18000,
-  "total_gz": 8178
+  "a.wasm": 7728,
+  "a.wasm.gz": 3502,
+  "total": 17998,
+  "total_gz": 8173
 }
diff --git a/test/code_size/embind_val_wasm.json b/test/code_size/embind_val_wasm.json
index 7ab5279b09f23..9af792edee31e 100644
--- a/test/code_size/embind_val_wasm.json
+++ b/test/code_size/embind_val_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 380,
   "a.js": 6849,
   "a.js.gz": 2947,
-  "a.wasm": 9565,
-  "a.wasm.gz": 4904,
-  "total": 16966,
-  "total_gz": 8231
+  "a.wasm": 9568,
+  "a.wasm.gz": 4911,
+  "total": 16969,
+  "total_gz": 8238
 }
diff --git a/test/code_size/hello_webgl2_wasm.json b/test/code_size/hello_webgl2_wasm.json
index 22fd8e4d6a868..6a80b58ccd57a 100644
--- a/test/code_size/hello_webgl2_wasm.json
+++ b/test/code_size/hello_webgl2_wasm.json
@@ -4,7 +4,7 @@
   "a.js": 4531,
   "a.js.gz": 2312,
   "a.wasm": 10402,
-  "a.wasm.gz": 6702,
+  "a.wasm.gz": 6704,
   "total": 15387,
-  "total_gz": 9342
+  "total_gz": 9344
 }
diff --git a/test/code_size/hello_webgl2_wasm2js.json b/test/code_size/hello_webgl2_wasm2js.json
index 23821367cd7f3..3d8c851127bc8 100644
--- a/test/code_size/hello_webgl2_wasm2js.json
+++ b/test/code_size/hello_webgl2_wasm2js.json
@@ -1,8 +1,8 @@
 {
   "a.html": 346,
   "a.html.gz": 262,
-  "a.js": 22211,
-  "a.js.gz": 11592,
-  "total": 22557,
-  "total_gz": 11854
+  "a.js": 22199,
+  "a.js.gz": 11579,
+  "total": 22545,
+  "total_gz": 11841
 }
diff --git a/test/code_size/hello_webgl_wasm.json b/test/code_size/hello_webgl_wasm.json
index 1fde89292c127..78cc66760308e 100644
--- a/test/code_size/hello_webgl_wasm.json
+++ b/test/code_size/hello_webgl_wasm.json
@@ -4,7 +4,7 @@
   "a.js": 4069,
   "a.js.gz": 2158,
   "a.wasm": 10402,
-  "a.wasm.gz": 6702,
+  "a.wasm.gz": 6704,
   "total": 14925,
-  "total_gz": 9188
+  "total_gz": 9190
 }
diff --git a/test/code_size/hello_webgl_wasm2js.json b/test/code_size/hello_webgl_wasm2js.json
index 34f3ca3446b66..1320f0d8bddcf 100644
--- a/test/code_size/hello_webgl_wasm2js.json
+++ b/test/code_size/hello_webgl_wasm2js.json
@@ -1,8 +1,8 @@
 {
   "a.html": 346,
   "a.html.gz": 262,
-  "a.js": 21737,
-  "a.js.gz": 11422,
-  "total": 22083,
-  "total_gz": 11684
+  "a.js": 21725,
+  "a.js.gz": 11413,
+  "total": 22071,
+  "total_gz": 11675
 }
diff --git a/test/code_size/random_printf_wasm.json b/test/code_size/random_printf_wasm.json
index d8ce697429428..2972d5a41da4c 100644
--- a/test/code_size/random_printf_wasm.json
+++ b/test/code_size/random_printf_wasm.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 12694,
-  "a.html.gz": 6898,
-  "total": 12694,
-  "total_gz": 6898
+  "a.html": 12698,
+  "a.html.gz": 6901,
+  "total": 12698,
+  "total_gz": 6901
 }
diff --git a/test/code_size/random_printf_wasm2js.json b/test/code_size/random_printf_wasm2js.json
index 6a2b6c02f2394..4f592a8bb51a2 100644
--- a/test/code_size/random_printf_wasm2js.json
+++ b/test/code_size/random_printf_wasm2js.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 17260,
-  "a.html.gz": 7500,
-  "total": 17260,
-  "total_gz": 7500
+  "a.html": 17276,
+  "a.html.gz": 7511,
+  "total": 17276,
+  "total_gz": 7511
 }
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.gzsize b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
index 6f34eceee162a..70461f8a6e739 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
@@ -1 +1 @@
-8438
+8450
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.jssize b/test/other/codesize/test_codesize_cxx_ctors1.jssize
index ef30866d142ec..cfe33a90d39b5 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.jssize
@@ -1 +1 @@
-20675
+20797
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.size b/test/other/codesize/test_codesize_cxx_ctors1.size
index 6f5d05d80af74..67d610a7db4b8 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.size
+++ b/test/other/codesize/test_codesize_cxx_ctors1.size
@@ -1 +1 @@
-129329
+129276
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.gzsize b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
index e2bf23cff5d1d..3a402b492b0d7 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
@@ -1 +1 @@
-8420
+8436
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.jssize b/test/other/codesize/test_codesize_cxx_ctors2.jssize
index 8a769a23a53ba..f9b02e898e2f7 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.jssize
@@ -1 +1 @@
-20643
+20765
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.size b/test/other/codesize/test_codesize_cxx_ctors2.size
index 72f45df2e4d3d..8649e524047b6 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.size
+++ b/test/other/codesize/test_codesize_cxx_ctors2.size
@@ -1 +1 @@
-128775
+128722
diff --git a/test/other/codesize/test_codesize_cxx_except.gzsize b/test/other/codesize/test_codesize_cxx_except.gzsize
index 54b5a9132e773..7eee896173205 100644
--- a/test/other/codesize/test_codesize_cxx_except.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except.gzsize
@@ -1 +1 @@
-9455
+9477
diff --git a/test/other/codesize/test_codesize_cxx_except.jssize b/test/other/codesize/test_codesize_cxx_except.jssize
index 9a0a588d1fcb0..790b94dcc58e4 100644
--- a/test/other/codesize/test_codesize_cxx_except.jssize
+++ b/test/other/codesize/test_codesize_cxx_except.jssize
@@ -1 +1 @@
-24518
+24640
diff --git a/test/other/codesize/test_codesize_cxx_except.size b/test/other/codesize/test_codesize_cxx_except.size
index 90c6c55ccfadd..4101c1e3f43f1 100644
--- a/test/other/codesize/test_codesize_cxx_except.size
+++ b/test/other/codesize/test_codesize_cxx_except.size
@@ -1 +1 @@
-171454
+171403
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
index bca93ddc17add..6536dd0d80ddf 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
@@ -1 +1 @@
-8402
+8419
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.jssize b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
index 370f74007befd..bd029fefbea94 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
@@ -1 +1 @@
-20569
+20691
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.size b/test/other/codesize/test_codesize_cxx_except_wasm.size
index 38ab40b967773..9cd423f86ea1c 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.size
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.size
@@ -1 +1 @@
-142545
+142503
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
index bca93ddc17add..6536dd0d80ddf 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
@@ -1 +1 @@
-8402
+8419
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
index 370f74007befd..bd029fefbea94 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
@@ -1 +1 @@
-20569
+20691
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size
index 515a2ddcbb305..1d7e1abae6ec3 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size
@@ -1 +1 @@
-145182
+145140
diff --git a/test/other/codesize/test_codesize_cxx_lto.gzsize b/test/other/codesize/test_codesize_cxx_lto.gzsize
index 0032be3e0bd21..c24db41a3eb53 100644
--- a/test/other/codesize/test_codesize_cxx_lto.gzsize
+++ b/test/other/codesize/test_codesize_cxx_lto.gzsize
@@ -1 +1 @@
-8331
+8349
diff --git a/test/other/codesize/test_codesize_cxx_lto.jssize b/test/other/codesize/test_codesize_cxx_lto.jssize
index b04d9afec53aa..6e2cb31607353 100644
--- a/test/other/codesize/test_codesize_cxx_lto.jssize
+++ b/test/other/codesize/test_codesize_cxx_lto.jssize
@@ -1 +1 @@
-20253
+20376
diff --git a/test/other/codesize/test_codesize_cxx_lto.size b/test/other/codesize/test_codesize_cxx_lto.size
index 574c227ad93dd..0f54d0629ace8 100644
--- a/test/other/codesize/test_codesize_cxx_lto.size
+++ b/test/other/codesize/test_codesize_cxx_lto.size
@@ -1 +1 @@
-122490
+122475
diff --git a/test/other/codesize/test_codesize_cxx_mangle.gzsize b/test/other/codesize/test_codesize_cxx_mangle.gzsize
index 78a8c98744fb2..a434caefa3d33 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.gzsize
+++ b/test/other/codesize/test_codesize_cxx_mangle.gzsize
@@ -1 +1 @@
-9461
+9480
diff --git a/test/other/codesize/test_codesize_cxx_mangle.jssize b/test/other/codesize/test_codesize_cxx_mangle.jssize
index 9a0a588d1fcb0..790b94dcc58e4 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.jssize
+++ b/test/other/codesize/test_codesize_cxx_mangle.jssize
@@ -1 +1 @@
-24518
+24640
diff --git a/test/other/codesize/test_codesize_cxx_mangle.size b/test/other/codesize/test_codesize_cxx_mangle.size
index 2a2edb42981d2..586adb4028ee1 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.size
+++ b/test/other/codesize/test_codesize_cxx_mangle.size
@@ -1 +1 @@
-232974
+232914
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.gzsize b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
index 6f34eceee162a..70461f8a6e739 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.gzsize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
@@ -1 +1 @@
-8438
+8450
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.jssize b/test/other/codesize/test_codesize_cxx_noexcept.jssize
index ef30866d142ec..cfe33a90d39b5 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.jssize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.jssize
@@ -1 +1 @@
-20675
+20797
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.size b/test/other/codesize/test_codesize_cxx_noexcept.size
index e7b9045cc72fb..ff65c81fe6324 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.size
+++ b/test/other/codesize/test_codesize_cxx_noexcept.size
@@ -1 +1 @@
-132135
+132080
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.size b/test/other/codesize/test_codesize_cxx_wasmfs.size
index cc3549b1b4502..8577c65274f9b 100644
--- a/test/other/codesize/test_codesize_cxx_wasmfs.size
+++ b/test/other/codesize/test_codesize_cxx_wasmfs.size
@@ -1 +1 @@
-169559
+169523
diff --git a/test/other/codesize/test_codesize_files_js_fs.gzsize b/test/other/codesize/test_codesize_files_js_fs.gzsize
index 7b1db08ddffd2..594e0a236d3a5 100644
--- a/test/other/codesize/test_codesize_files_js_fs.gzsize
+++ b/test/other/codesize/test_codesize_files_js_fs.gzsize
@@ -1 +1 @@
-7564
+7584
diff --git a/test/other/codesize/test_codesize_files_js_fs.jssize b/test/other/codesize/test_codesize_files_js_fs.jssize
index cc1723f891240..6689ea31bd688 100644
--- a/test/other/codesize/test_codesize_files_js_fs.jssize
+++ b/test/other/codesize/test_codesize_files_js_fs.jssize
@@ -1 +1 @@
-18573
+18694
diff --git a/test/other/codesize/test_codesize_files_wasmfs.size b/test/other/codesize/test_codesize_files_wasmfs.size
index 1d399b854854f..8dbc1b508195f 100644
--- a/test/other/codesize/test_codesize_files_wasmfs.size
+++ b/test/other/codesize/test_codesize_files_wasmfs.size
@@ -1 +1 @@
-51138
+51157
diff --git a/test/other/codesize/test_codesize_hello_O0.size b/test/other/codesize/test_codesize_hello_O0.size
index 6d44e85748746..b55e8eb4cd221 100644
--- a/test/other/codesize/test_codesize_hello_O0.size
+++ b/test/other/codesize/test_codesize_hello_O0.size
@@ -1 +1 @@
-14453
+14531
diff --git a/test/other/codesize/test_codesize_hello_O1.size b/test/other/codesize/test_codesize_hello_O1.size
index 1db299c003761..48c6e93066ff9 100644
--- a/test/other/codesize/test_codesize_hello_O1.size
+++ b/test/other/codesize/test_codesize_hello_O1.size
@@ -1 +1 @@
-2460
+2535
diff --git a/test/other/codesize/test_codesize_minimal_O0.size b/test/other/codesize/test_codesize_minimal_O0.size
index 4b02a197f603b..37cdd416f157a 100644
--- a/test/other/codesize/test_codesize_minimal_O0.size
+++ b/test/other/codesize/test_codesize_minimal_O0.size
@@ -1 +1 @@
-900
+975
diff --git a/test/other/codesize/test_codesize_minimal_O1.size b/test/other/codesize/test_codesize_minimal_O1.size
index d8fc48a4f27cc..100000a67875f 100644
--- a/test/other/codesize/test_codesize_minimal_O1.size
+++ b/test/other/codesize/test_codesize_minimal_O1.size
@@ -1 +1 @@
-301
+376
diff --git a/test/other/codesize/test_codesize_minimal_pthreads.size b/test/other/codesize/test_codesize_minimal_pthreads.size
index 7bdc3813b38a5..10b2d7f643c17 100644
--- a/test/other/codesize/test_codesize_minimal_pthreads.size
+++ b/test/other/codesize/test_codesize_minimal_pthreads.size
@@ -1 +1 @@
-19480
+19501
diff --git a/test/other/test_unoptimized_code_size.wasm.size b/test/other/test_unoptimized_code_size.wasm.size
index 6d44e85748746..b55e8eb4cd221 100644
--- a/test/other/test_unoptimized_code_size.wasm.size
+++ b/test/other/test_unoptimized_code_size.wasm.size
@@ -1 +1 @@
-14453
+14531
diff --git a/test/other/test_unoptimized_code_size_no_asserts.wasm.size b/test/other/test_unoptimized_code_size_no_asserts.wasm.size
index e65cafbcc8d8a..a65dc9b14619a 100644
--- a/test/other/test_unoptimized_code_size_no_asserts.wasm.size
+++ b/test/other/test_unoptimized_code_size_no_asserts.wasm.size
@@ -1 +1 @@
-11646
+11724
diff --git a/test/other/test_unoptimized_code_size_strict.wasm.size b/test/other/test_unoptimized_code_size_strict.wasm.size
index 6d44e85748746..b55e8eb4cd221 100644
--- a/test/other/test_unoptimized_code_size_strict.wasm.size
+++ b/test/other/test_unoptimized_code_size_strict.wasm.size
@@ -1 +1 @@
-14453
+14531

From 4d87d910a4522e0b1c447f03779078adc423bdbc Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Wed, 27 Nov 2024 18:43:18 +0100
Subject: [PATCH 6/7] Revert accidental changelog entry

---
 ChangeLog.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 80d5f33a8c17c..0f27fb2734d4a 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -21,10 +21,6 @@ See docs/process.md for more on how version tagging works.
 3.1.73 (in development)
 -----------------------
 - 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
-  instead of using the same time for all three.
-- mimalloc was updated to 2.1.7. (#21548)
 
 3.1.72 - 11/19/24
 -----------------

From 1d9c156c47d79445dec9dd51a84095bcabcd473c Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Thu, 28 Nov 2024 13:45:28 +0100
Subject: [PATCH 7/7] retrigger ci