From 742a3e60bdc06d650e7a641fa31aae14216bcc29 Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Thu, 1 May 2025 10:37:32 +0000
Subject: [PATCH 01/18] Fix nested dependencies handling in rpath

---
 src/lib/libdylink.js |  5 ++++-
 test/test_other.py   | 19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/lib/libdylink.js b/src/lib/libdylink.js
index b1e70178286f6..f5931218f5342 100644
--- a/src/lib/libdylink.js
+++ b/src/lib/libdylink.js
@@ -904,7 +904,8 @@ var LibraryDylink = {
     // We need to set rpath in flags based on the current library's rpath.
     // We can't mutate flags or else if a depends on b and c and b depends on d,
     // then c will be loaded with b's rpath instead of a's.
-    flags = {...flags, rpath: { parentLibPath: libName, paths: metadata.runtimePaths }}
+    var dso = LDSO.loadedLibsByName[libName];
+    flags = {...flags, rpath: { parentLibPath: dso.path, paths: metadata.runtimePaths }}
     // now load needed libraries and the module itself.
     if (flags.loadAsync) {
       return metadata.neededDynlibs
@@ -937,6 +938,7 @@ var LibraryDylink = {
     var dso = {
       refcount: Infinity,
       name,
+      path: name, // full path to the library, updated when the library is resolved in the filesystem.
       exports: syms,
       global: true,
     };
@@ -1105,6 +1107,7 @@ var LibraryDylink = {
 #endif
       if (f) {
         var libData = FS.readFile(f, {encoding: 'binary'});
+        dso.path = f;
         return flags.loadAsync ? Promise.resolve(libData) : libData;
       }
 #endif
diff --git a/test/test_other.py b/test/test_other.py
index 2e0b3ad792370..7a1d7357589b0 100644
--- a/test/test_other.py
+++ b/test/test_other.py
@@ -7701,11 +7701,22 @@ def test_ld_library_path(self, args):
 
   @also_with_wasmfs
   def test_dlopen_rpath(self):
+    create_file('hello_nested_dep.c', r'''
+    #include <stdio.h>
+
+    void hello_nested_dep() {
+      printf("Hello_nested_dep\n");
+      return;
+    }
+    ''')
     create_file('hello_dep.c', r'''
     #include <stdio.h>
 
+    void hello_nested_dep();
+
     void hello_dep() {
       printf("Hello_dep\n");
+      hello_nested_dep();
       return;
     }
     ''')
@@ -7747,20 +7758,22 @@ def test_dlopen_rpath(self):
     os.mkdir('subdir')
 
     def _build(rpath_flag, expected, **kwds):
-      self.run_process([EMCC, '-o', 'subdir/libhello_dep.so', 'hello_dep.c', '-sSIDE_MODULE'])
+      self.run_process([EMCC, '-o', 'subdir/libhello_nested_dep.so', 'hello_nested_dep.c', '-sSIDE_MODULE'])
+      self.run_process([EMCC, '-o', 'subdir/libhello_dep.so', 'hello_dep.c', '-sSIDE_MODULE', 'subdir/libhello_nested_dep.so'] + rpath_flag)
       self.run_process([EMCC, '-o', 'hello.wasm', 'hello.c', '-sSIDE_MODULE', 'subdir/libhello_dep.so'] + rpath_flag)
       args = ['--profiling-funcs', '-sMAIN_MODULE=2', '-sINITIAL_MEMORY=32Mb',
                         '--embed-file', 'hello.wasm@/usr/lib/libhello.wasm',
                         '--embed-file', 'subdir/libhello_dep.so@/usr/lib/subdir/libhello_dep.so',
+                        '--embed-file', 'subdir/libhello_nested_dep.so@/usr/lib/subdir/libhello_nested_dep.so',
                         'hello.wasm', '-sNO_AUTOLOAD_DYLIBS',
-                        '-L./subdir', '-lhello_dep']
+                        '-L./subdir', '-lhello_dep', '-lhello_nested_dep']
       self.do_runf('main.c', expected, emcc_args=args, **kwds)
 
     # case 1) without rpath: fail to locate the library
     _build([], r"no such file or directory, open '.*libhello_dep\.so'", regex=True, assert_returncode=NON_ZERO)
 
     # case 2) with rpath: success
-    _build(['-Wl,-rpath,$ORIGIN/subdir'], "Hello\nHello_dep\nOk\n")
+    _build(['-Wl,-rpath,$ORIGIN/subdir,-rpath,$ORIGIN'], "Hello\nHello_dep\nHello_nested_dep\nOk\n")
 
   def test_dlopen_bad_flags(self):
     create_file('main.c', r'''

From f1f85ffb68782810c3da1e046836c0bba9fa87dd Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Thu, 1 May 2025 12:03:26 +0000
Subject: [PATCH 02/18] fallback

---
 src/lib/libdylink.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/libdylink.js b/src/lib/libdylink.js
index f5931218f5342..e29a704c7293b 100644
--- a/src/lib/libdylink.js
+++ b/src/lib/libdylink.js
@@ -905,7 +905,8 @@ var LibraryDylink = {
     // We can't mutate flags or else if a depends on b and c and b depends on d,
     // then c will be loaded with b's rpath instead of a's.
     var dso = LDSO.loadedLibsByName[libName];
-    flags = {...flags, rpath: { parentLibPath: dso.path, paths: metadata.runtimePaths }}
+    var libPath = dso?.path ?? libName
+    flags = {...flags, rpath: { parentLibPath: libPath, paths: metadata.runtimePaths }}
     // now load needed libraries and the module itself.
     if (flags.loadAsync) {
       return metadata.neededDynlibs

From 65f39d42355d5102cd1efae68a2461547ed709fe Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Thu, 1 May 2025 12:03:42 +0000
Subject: [PATCH 03/18] syntax

---
 src/lib/libdylink.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/libdylink.js b/src/lib/libdylink.js
index e29a704c7293b..57beb0f53cbb3 100644
--- a/src/lib/libdylink.js
+++ b/src/lib/libdylink.js
@@ -905,7 +905,7 @@ var LibraryDylink = {
     // We can't mutate flags or else if a depends on b and c and b depends on d,
     // then c will be loaded with b's rpath instead of a's.
     var dso = LDSO.loadedLibsByName[libName];
-    var libPath = dso?.path ?? libName
+    var libPath = dso?.path ?? libName;
     flags = {...flags, rpath: { parentLibPath: libPath, paths: metadata.runtimePaths }}
     // now load needed libraries and the module itself.
     if (flags.loadAsync) {

From 8bc8fff4397781587b2075c17e02e5984cef74e9 Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Thu, 1 May 2025 12:12:46 +0000
Subject: [PATCH 04/18] Automatic rebaseline of codesize expectations. NFC

This is an automatic change generated by tools/maint/rebaseline_tests.py.

The following (2) test expectation files were updated by
running the tests with `--rebaseline`:

```
other/codesize/test_codesize_hello_dylink.gzsize: 11735 => 11758 [+23 bytes / +0.20%]
other/codesize/test_codesize_hello_dylink.jssize: 27774 => 27799 [+25 bytes / +0.09%]

Average change: +0.14% (+0.09% - +0.20%)
```
---
 test/other/codesize/test_codesize_hello_dylink.gzsize | 2 +-
 test/other/codesize/test_codesize_hello_dylink.jssize | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/other/codesize/test_codesize_hello_dylink.gzsize b/test/other/codesize/test_codesize_hello_dylink.gzsize
index a5755921eac44..ace24481f1d87 100644
--- a/test/other/codesize/test_codesize_hello_dylink.gzsize
+++ b/test/other/codesize/test_codesize_hello_dylink.gzsize
@@ -1 +1 @@
-11735
+11758
diff --git a/test/other/codesize/test_codesize_hello_dylink.jssize b/test/other/codesize/test_codesize_hello_dylink.jssize
index c82e0d84da885..4e26f740d8b3f 100644
--- a/test/other/codesize/test_codesize_hello_dylink.jssize
+++ b/test/other/codesize/test_codesize_hello_dylink.jssize
@@ -1 +1 @@
-27774
+27799

From 62dc4a43072422b0c924dd354953e80cd7ab9243 Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Fri, 2 May 2025 07:35:08 +0000
Subject: [PATCH 05/18] wasm ==> so

---
 test/test_other.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test_other.py b/test/test_other.py
index 7a1d7357589b0..bc81a7f274e63 100644
--- a/test/test_other.py
+++ b/test/test_other.py
@@ -7743,7 +7743,7 @@ def test_dlopen_rpath(self):
       void (*f)();
       double (*f2)(double);
 
-      h = dlopen("/usr/lib/libhello.wasm", RTLD_NOW);
+      h = dlopen("/usr/lib/libhello.so", RTLD_NOW);
       assert(h);
       f = dlsym(h, "hello");
       assert(f);
@@ -7760,12 +7760,12 @@ def test_dlopen_rpath(self):
     def _build(rpath_flag, expected, **kwds):
       self.run_process([EMCC, '-o', 'subdir/libhello_nested_dep.so', 'hello_nested_dep.c', '-sSIDE_MODULE'])
       self.run_process([EMCC, '-o', 'subdir/libhello_dep.so', 'hello_dep.c', '-sSIDE_MODULE', 'subdir/libhello_nested_dep.so'] + rpath_flag)
-      self.run_process([EMCC, '-o', 'hello.wasm', 'hello.c', '-sSIDE_MODULE', 'subdir/libhello_dep.so'] + rpath_flag)
+      self.run_process([EMCC, '-o', 'hello.so', 'hello.c', '-sSIDE_MODULE', 'subdir/libhello_dep.so'] + rpath_flag)
       args = ['--profiling-funcs', '-sMAIN_MODULE=2', '-sINITIAL_MEMORY=32Mb',
-                        '--embed-file', 'hello.wasm@/usr/lib/libhello.wasm',
+                        '--embed-file', 'hello.so@/usr/lib/libhello.so',
                         '--embed-file', 'subdir/libhello_dep.so@/usr/lib/subdir/libhello_dep.so',
                         '--embed-file', 'subdir/libhello_nested_dep.so@/usr/lib/subdir/libhello_nested_dep.so',
-                        'hello.wasm', '-sNO_AUTOLOAD_DYLIBS',
+                        'hello.so', '-sNO_AUTOLOAD_DYLIBS',
                         '-L./subdir', '-lhello_dep', '-lhello_nested_dep']
       self.do_runf('main.c', expected, emcc_args=args, **kwds)
 

From 81b1dbdd0503f3a7d2a9a69fb9ffc7372e70e069 Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Fri, 2 May 2025 07:35:33 +0000
Subject: [PATCH 06/18] Always pass absolute path in loadDynamicLibrary

---
 src/lib/libdylink.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/lib/libdylink.js b/src/lib/libdylink.js
index 57beb0f53cbb3..8eca0c229c92b 100644
--- a/src/lib/libdylink.js
+++ b/src/lib/libdylink.js
@@ -904,19 +904,25 @@ var LibraryDylink = {
     // We need to set rpath in flags based on the current library's rpath.
     // We can't mutate flags or else if a depends on b and c and b depends on d,
     // then c will be loaded with b's rpath instead of a's.
-    var dso = LDSO.loadedLibsByName[libName];
-    var libPath = dso?.path ?? libName;
-    flags = {...flags, rpath: { parentLibPath: libPath, paths: metadata.runtimePaths }}
+    flags = {...flags, rpath: { parentLibPath: libName, paths: metadata.runtimePaths }}
     // now load needed libraries and the module itself.
     if (flags.loadAsync) {
       return metadata.neededDynlibs
-        .reduce((chain, dynNeeded) => chain.then(() =>
-          loadDynamicLibrary(dynNeeded, flags, localScope)
-        ), Promise.resolve())
+        .reduce((chain, needed) => chain.then(() => {
+#if FILESYSTEM
+          needed = findLibraryFS(needed, flags.rpath) ?? needed;
+#endif
+          return loadDynamicLibrary(needed, flags, localScope);
+        }), Promise.resolve())
         .then(loadModule);
     }
 
-    metadata.neededDynlibs.forEach((needed) => loadDynamicLibrary(needed, flags, localScope));
+    metadata.neededDynlibs.forEach((needed) => {
+#if FILESYSTEM
+      needed = findLibraryFS(needed, flags.rpath) ?? needed;
+#endif      
+      return loadDynamicLibrary(needed, flags, localScope);
+    });
     return loadModule();
   },
 
@@ -939,7 +945,6 @@ var LibraryDylink = {
     var dso = {
       refcount: Infinity,
       name,
-      path: name, // full path to the library, updated when the library is resolved in the filesystem.
       exports: syms,
       global: true,
     };

From f4e3b254a04e002ccde2a813201d8124527825cf Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Fri, 2 May 2025 07:36:59 +0000
Subject: [PATCH 07/18] Remove unnecessary changes

---
 src/lib/libdylink.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/libdylink.js b/src/lib/libdylink.js
index 8eca0c229c92b..c5860f86d5963 100644
--- a/src/lib/libdylink.js
+++ b/src/lib/libdylink.js
@@ -1113,7 +1113,6 @@ var LibraryDylink = {
 #endif
       if (f) {
         var libData = FS.readFile(f, {encoding: 'binary'});
-        dso.path = f;
         return flags.loadAsync ? Promise.resolve(libData) : libData;
       }
 #endif

From 8d925656da41c53bd3c6fdb76a3117b9234d3b0a Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Fri, 2 May 2025 07:43:08 +0000
Subject: [PATCH 08/18] Automatic rebaseline of codesize expectations. NFC

This is an automatic change generated by tools/maint/rebaseline_tests.py.

The following (2) test expectation files were updated by
running the tests with `--rebaseline`:

```
other/codesize/test_codesize_hello_dylink.gzsize: 11758 => 11757 [-1 bytes / -0.01%]
other/codesize/test_codesize_hello_dylink.jssize: 27799 => 27823 [+24 bytes / +0.09%]

Average change: +0.04% (-0.01% - +0.09%)
```
---
 test/other/codesize/test_codesize_hello_dylink.gzsize | 2 +-
 test/other/codesize/test_codesize_hello_dylink.jssize | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/other/codesize/test_codesize_hello_dylink.gzsize b/test/other/codesize/test_codesize_hello_dylink.gzsize
index ace24481f1d87..39b0cf833d17c 100644
--- a/test/other/codesize/test_codesize_hello_dylink.gzsize
+++ b/test/other/codesize/test_codesize_hello_dylink.gzsize
@@ -1 +1 @@
-11758
+11757
diff --git a/test/other/codesize/test_codesize_hello_dylink.jssize b/test/other/codesize/test_codesize_hello_dylink.jssize
index 4e26f740d8b3f..9e19cdf0c05e0 100644
--- a/test/other/codesize/test_codesize_hello_dylink.jssize
+++ b/test/other/codesize/test_codesize_hello_dylink.jssize
@@ -1 +1 @@
-27799
+27823

From af365413d32195c8da7dc55b2af45938c02ad62c Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Sat, 31 May 2025 13:25:12 +0000
Subject: [PATCH 09/18] Store filename only

---
 src/lib/libdylink.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/libdylink.js b/src/lib/libdylink.js
index 987b742f9cd64..e3fb9ca63f234 100644
--- a/src/lib/libdylink.js
+++ b/src/lib/libdylink.js
@@ -1049,7 +1049,10 @@ var LibraryDylink = {
     // when loadDynamicLibrary did not have flags, libraries were loaded
     // globally & permanently
 
-    var dso = LDSO.loadedLibsByName[libName];
+    // Extract the filename part if libName is an absolute path
+    // This is to avoid problem when the same library is loaded from multiple folders.
+    var basename = libName.split('/').pop();
+    var dso = LDSO.loadedLibsByName[basename];
     if (dso) {
       // the library is being loaded or has been loaded already.
 #if ASSERTIONS
@@ -1080,7 +1083,7 @@ var LibraryDylink = {
     }
 
     // allocate new DSO
-    dso = newDSO(libName, handle, 'loading');
+    dso = newDSO(basename, handle, 'loading');
     dso.refcount = flags.nodelete ? Infinity : 1;
     dso.global = flags.global;
 

From f4fecbb3934ddf23929cb43f5fa14f1833716f77 Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Sun, 1 Jun 2025 15:11:51 +0000
Subject: [PATCH 10/18] Revert "Store filename only"

This reverts commit af365413d32195c8da7dc55b2af45938c02ad62c.
---
 src/lib/libdylink.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/lib/libdylink.js b/src/lib/libdylink.js
index e3fb9ca63f234..987b742f9cd64 100644
--- a/src/lib/libdylink.js
+++ b/src/lib/libdylink.js
@@ -1049,10 +1049,7 @@ var LibraryDylink = {
     // when loadDynamicLibrary did not have flags, libraries were loaded
     // globally & permanently
 
-    // Extract the filename part if libName is an absolute path
-    // This is to avoid problem when the same library is loaded from multiple folders.
-    var basename = libName.split('/').pop();
-    var dso = LDSO.loadedLibsByName[basename];
+    var dso = LDSO.loadedLibsByName[libName];
     if (dso) {
       // the library is being loaded or has been loaded already.
 #if ASSERTIONS
@@ -1083,7 +1080,7 @@ var LibraryDylink = {
     }
 
     // allocate new DSO
-    dso = newDSO(basename, handle, 'loading');
+    dso = newDSO(libName, handle, 'loading');
     dso.refcount = flags.nodelete ? Infinity : 1;
     dso.global = flags.global;
 

From b86e1f055952c5ef8cd305cf360110cabc60d266 Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Sun, 1 Jun 2025 15:32:29 +0000
Subject: [PATCH 11/18] Fix codesize

---
 test/other/codesize/test_codesize_hello_dylink.gzsize | 2 +-
 test/other/codesize/test_codesize_hello_dylink.jssize | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/other/codesize/test_codesize_hello_dylink.gzsize b/test/other/codesize/test_codesize_hello_dylink.gzsize
index 24d09039ee101..c32c6049908ed 100644
--- a/test/other/codesize/test_codesize_hello_dylink.gzsize
+++ b/test/other/codesize/test_codesize_hello_dylink.gzsize
@@ -1 +1 @@
-11676
+11696
diff --git a/test/other/codesize/test_codesize_hello_dylink.jssize b/test/other/codesize/test_codesize_hello_dylink.jssize
index 0f1f70f75a5f6..f95e9327160ee 100644
--- a/test/other/codesize/test_codesize_hello_dylink.jssize
+++ b/test/other/codesize/test_codesize_hello_dylink.jssize
@@ -1 +1 @@
-27564
+27613

From 12f094a9270fb84573c655faa7d75cc3cf539820 Mon Sep 17 00:00:00 2001
From: ryanking13 <def6488@gmail.com>
Date: Sat, 8 Nov 2025 18:35:21 +0900
Subject: [PATCH 12/18] rebaseline

---
 test/codesize/test_codesize_hello_dylink.json     | 2 +-
 test/codesize/test_codesize_hello_dylink_all.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/codesize/test_codesize_hello_dylink.json b/test/codesize/test_codesize_hello_dylink.json
index ca963a0cb05fa..29e6f3f9d2aaf 100644
--- a/test/codesize/test_codesize_hello_dylink.json
+++ b/test/codesize/test_codesize_hello_dylink.json
@@ -3,7 +3,7 @@
   "a.out.js.gz": 11345,
   "a.out.nodebug.wasm": 17757,
   "a.out.nodebug.wasm.gz": 8972,
-  "total": 44309,
+  "total": 44349,
   "total_gz": 20317,
   "sent": [
     "__syscall_stat64",
diff --git a/test/codesize/test_codesize_hello_dylink_all.json b/test/codesize/test_codesize_hello_dylink_all.json
index 0d1f74f824ac2..7ead98b0d78ae 100644
--- a/test/codesize/test_codesize_hello_dylink_all.json
+++ b/test/codesize/test_codesize_hello_dylink_all.json
@@ -1,7 +1,7 @@
 {
   "a.out.js": 245483,
   "a.out.nodebug.wasm": 574042,
-  "total": 819525,
+  "total": 819566,
   "sent": [
     "IMG_Init",
     "IMG_Load",

From ee7070d5aa8a83dd2ec04088e45dc81c9e1a3343 Mon Sep 17 00:00:00 2001
From: ryanking13 <def6488@gmail.com>
Date: Sat, 8 Nov 2025 18:59:42 +0900
Subject: [PATCH 13/18] Automatic rebaseline of codesize expectations. NFC

This is an automatic change generated by tools/maint/rebaseline_tests.py.

The following (2) test expectation files were updated by
running the tests with `--rebaseline`:

```
codesize/test_codesize_hello_dylink.json: 44349 => 44349 [+0 bytes / +0.00%]
codesize/test_codesize_hello_dylink_all.json: 819566 => 819566 [+0 bytes / +0.00%]

Average change: +0.00% (+0.00% - +0.00%)
```
---
 test/codesize/test_codesize_hello_dylink.json     | 6 +++---
 test/codesize/test_codesize_hello_dylink_all.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/codesize/test_codesize_hello_dylink.json b/test/codesize/test_codesize_hello_dylink.json
index 29e6f3f9d2aaf..78061e2d6e97e 100644
--- a/test/codesize/test_codesize_hello_dylink.json
+++ b/test/codesize/test_codesize_hello_dylink.json
@@ -1,10 +1,10 @@
 {
-  "a.out.js": 26552,
-  "a.out.js.gz": 11345,
+  "a.out.js": 26592,
+  "a.out.js.gz": 11362,
   "a.out.nodebug.wasm": 17757,
   "a.out.nodebug.wasm.gz": 8972,
   "total": 44349,
-  "total_gz": 20317,
+  "total_gz": 20334,
   "sent": [
     "__syscall_stat64",
     "emscripten_resize_heap",
diff --git a/test/codesize/test_codesize_hello_dylink_all.json b/test/codesize/test_codesize_hello_dylink_all.json
index 7ead98b0d78ae..5ba64ae9ce9e7 100644
--- a/test/codesize/test_codesize_hello_dylink_all.json
+++ b/test/codesize/test_codesize_hello_dylink_all.json
@@ -1,5 +1,5 @@
 {
-  "a.out.js": 245483,
+  "a.out.js": 245524,
   "a.out.nodebug.wasm": 574042,
   "total": 819566,
   "sent": [

From 9d7550f555d25b87f53043e90574ae1bf7257a20 Mon Sep 17 00:00:00 2001
From: ryanking13 <def6488@gmail.com>
Date: Thu, 20 Nov 2025 23:51:39 +0900
Subject: [PATCH 14/18] Automatic rebaseline of codesize expectations. NFC

This is an automatic change generated by tools/maint/rebaseline_tests.py.

The following (30) test expectation files were updated by
running the tests with `--rebaseline`:

```
codesize/test_codesize_cxx_ctors1.json: 149124 => 149173 [+49 bytes / +0.03%]
codesize/test_codesize_cxx_ctors2.json: 148528 => 148577 [+49 bytes / +0.03%]
codesize/test_codesize_cxx_except.json: 194587 => 194636 [+49 bytes / +0.03%]
codesize/test_codesize_cxx_except_wasm.json: 164104 => 164153 [+49 bytes / +0.03%]
codesize/test_codesize_cxx_except_wasm_legacy.json: 161762 => 161811 [+49 bytes / +0.03%]
codesize/test_codesize_cxx_lto.json: 125465 => 125448 [-17 bytes / -0.01%]
codesize/test_codesize_cxx_mangle.json: 258658 => 258718 [+60 bytes / +0.02%]
codesize/test_codesize_cxx_noexcept.json: 151541 => 151590 [+49 bytes / +0.03%]
codesize/test_codesize_cxx_wasmfs.json: 176718 => 176912 [+194 bytes / +0.11%]
codesize/test_codesize_files_wasmfs.json: 55679 => 55818 [+139 bytes / +0.25%]
codesize/test_codesize_hello_O0.json: 39326 => 39362 [+36 bytes / +0.09%]
codesize/test_codesize_hello_dylink.json: 44349 => 44469 [+120 bytes / +0.27%]
codesize/test_codesize_hello_dylink_all.json: 819566 => 820006 [+440 bytes / +0.05%]
codesize/test_codesize_mem_O3.json: 9612 => 9610 [-2 bytes / -0.02%]
codesize/test_codesize_mem_O3_grow.json: 9898 => 9896 [-2 bytes / -0.02%]
codesize/test_codesize_mem_O3_grow_standalone.json: 9651 => 9649 [-2 bytes / -0.02%]
codesize/test_codesize_mem_O3_standalone.json: 9509 => 9507 [-2 bytes / -0.02%]
codesize/test_codesize_mem_O3_standalone_lib.json: 8804 => 8802 [-2 bytes / -0.02%]
codesize/test_codesize_mem_O3_standalone_narg.json: 8837 => 8835 [-2 bytes / -0.02%]
codesize/test_codesize_mem_O3_standalone_narg_flto.json: 7649 => 7647 [-2 bytes / -0.03%]
codesize/test_codesize_minimal_pthreads.json: 27226 => 27220 [-6 bytes / -0.02%]
codesize/test_codesize_minimal_pthreads_memgrowth.json: 27654 => 27648 [-6 bytes / -0.02%]
codesize/test_minimal_runtime_code_size_hello_webgl2_wasm.json: 13201 => 13204 [+3 bytes / +0.02%]
codesize/test_minimal_runtime_code_size_hello_webgl2_wasm2js.json: 18539 => 18554 [+15 bytes / +0.08%]
codesize/test_minimal_runtime_code_size_hello_webgl2_wasm_singlefile.json: 15136 => 15147 [+11 bytes / +0.07%]
codesize/test_minimal_runtime_code_size_hello_webgl_wasm.json: 12739 => 12742 [+3 bytes / +0.02%]
codesize/test_minimal_runtime_code_size_hello_webgl_wasm2js.json: 18066 => 18081 [+15 bytes / +0.08%]
codesize/test_minimal_runtime_code_size_random_printf_wasm.json: 10980 => 10993 [+13 bytes / +0.12%]
codesize/test_minimal_runtime_code_size_random_printf_wasm2js.json: 17169 => 17229 [+60 bytes / +0.35%]
codesize/test_unoptimized_code_size.json: 180948 => 181056 [+108 bytes / +0.06%]

Average change: +0.05% (-0.03% - +0.35%)
```
---
 test/codesize/test_codesize_cxx_ctors1.json   |  8 +++----
 test/codesize/test_codesize_cxx_ctors2.json   |  8 +++----
 test/codesize/test_codesize_cxx_except.json   |  8 +++----
 .../test_codesize_cxx_except_wasm.json        |  8 +++----
 .../test_codesize_cxx_except_wasm_legacy.json |  8 +++----
 test/codesize/test_codesize_cxx_lto.json      |  8 +++----
 test/codesize/test_codesize_cxx_mangle.json   |  8 +++----
 test/codesize/test_codesize_cxx_noexcept.json |  8 +++----
 test/codesize/test_codesize_cxx_wasmfs.json   |  8 +++----
 test/codesize/test_codesize_files_wasmfs.json |  8 +++----
 test/codesize/test_codesize_hello_O0.json     |  8 +++----
 test/codesize/test_codesize_hello_dylink.json |  8 +++----
 .../test_codesize_hello_dylink_all.json       | 22 ++++++++++++++-----
 test/codesize/test_codesize_mem_O3.json       |  8 +++----
 test/codesize/test_codesize_mem_O3_grow.json  |  8 +++----
 .../test_codesize_mem_O3_grow_standalone.json |  8 +++----
 .../test_codesize_mem_O3_standalone.json      |  4 ++--
 .../test_codesize_mem_O3_standalone_lib.json  |  8 +++----
 .../test_codesize_mem_O3_standalone_narg.json |  8 +++----
 ..._codesize_mem_O3_standalone_narg_flto.json |  8 +++----
 .../test_codesize_minimal_pthreads.json       |  8 +++----
 ...t_codesize_minimal_pthreads_memgrowth.json |  8 +++----
 ...l_runtime_code_size_hello_webgl2_wasm.json |  8 +++----
 ...untime_code_size_hello_webgl2_wasm2js.json |  8 +++----
 ...ode_size_hello_webgl2_wasm_singlefile.json |  4 ++--
 ...al_runtime_code_size_hello_webgl_wasm.json |  8 +++----
 ...runtime_code_size_hello_webgl_wasm2js.json |  8 +++----
 ..._runtime_code_size_random_printf_wasm.json |  4 ++--
 ...ntime_code_size_random_printf_wasm2js.json |  4 ++--
 test/codesize/test_unoptimized_code_size.json | 16 +++++++-------
 30 files changed, 128 insertions(+), 118 deletions(-)

diff --git a/test/codesize/test_codesize_cxx_ctors1.json b/test/codesize/test_codesize_cxx_ctors1.json
index 39f780350e871..f47f641d6f030 100644
--- a/test/codesize/test_codesize_cxx_ctors1.json
+++ b/test/codesize/test_codesize_cxx_ctors1.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19670,
   "a.out.js.gz": 8152,
-  "a.out.nodebug.wasm": 129454,
-  "a.out.nodebug.wasm.gz": 49164,
-  "total": 149124,
-  "total_gz": 57316,
+  "a.out.nodebug.wasm": 129503,
+  "a.out.nodebug.wasm.gz": 49248,
+  "total": 149173,
+  "total_gz": 57400,
   "sent": [
     "__cxa_throw",
     "_abort_js",
diff --git a/test/codesize/test_codesize_cxx_ctors2.json b/test/codesize/test_codesize_cxx_ctors2.json
index f6d061142c8de..d49c9f1b6096c 100644
--- a/test/codesize/test_codesize_cxx_ctors2.json
+++ b/test/codesize/test_codesize_cxx_ctors2.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19647,
   "a.out.js.gz": 8139,
-  "a.out.nodebug.wasm": 128881,
-  "a.out.nodebug.wasm.gz": 48809,
-  "total": 148528,
-  "total_gz": 56948,
+  "a.out.nodebug.wasm": 128930,
+  "a.out.nodebug.wasm.gz": 48886,
+  "total": 148577,
+  "total_gz": 57025,
   "sent": [
     "__cxa_throw",
     "_abort_js",
diff --git a/test/codesize/test_codesize_cxx_except.json b/test/codesize/test_codesize_cxx_except.json
index b42030f733bf7..4dde3d8ee470a 100644
--- a/test/codesize/test_codesize_cxx_except.json
+++ b/test/codesize/test_codesize_cxx_except.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 23325,
   "a.out.js.gz": 9128,
-  "a.out.nodebug.wasm": 171262,
-  "a.out.nodebug.wasm.gz": 57278,
-  "total": 194587,
-  "total_gz": 66406,
+  "a.out.nodebug.wasm": 171311,
+  "a.out.nodebug.wasm.gz": 57348,
+  "total": 194636,
+  "total_gz": 66476,
   "sent": [
     "__cxa_begin_catch",
     "__cxa_end_catch",
diff --git a/test/codesize/test_codesize_cxx_except_wasm.json b/test/codesize/test_codesize_cxx_except_wasm.json
index d36e2053e9471..12f821fb72467 100644
--- a/test/codesize/test_codesize_cxx_except_wasm.json
+++ b/test/codesize/test_codesize_cxx_except_wasm.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19486,
   "a.out.js.gz": 8077,
-  "a.out.nodebug.wasm": 144618,
-  "a.out.nodebug.wasm.gz": 54850,
-  "total": 164104,
-  "total_gz": 62927,
+  "a.out.nodebug.wasm": 144667,
+  "a.out.nodebug.wasm.gz": 54907,
+  "total": 164153,
+  "total_gz": 62984,
   "sent": [
     "_abort_js",
     "_tzset_js",
diff --git a/test/codesize/test_codesize_cxx_except_wasm_legacy.json b/test/codesize/test_codesize_cxx_except_wasm_legacy.json
index a169b35ce787a..89914a35b80ab 100644
--- a/test/codesize/test_codesize_cxx_except_wasm_legacy.json
+++ b/test/codesize/test_codesize_cxx_except_wasm_legacy.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19555,
   "a.out.js.gz": 8099,
-  "a.out.nodebug.wasm": 142207,
-  "a.out.nodebug.wasm.gz": 54300,
-  "total": 161762,
-  "total_gz": 62399,
+  "a.out.nodebug.wasm": 142256,
+  "a.out.nodebug.wasm.gz": 54366,
+  "total": 161811,
+  "total_gz": 62465,
   "sent": [
     "_abort_js",
     "_tzset_js",
diff --git a/test/codesize/test_codesize_cxx_lto.json b/test/codesize/test_codesize_cxx_lto.json
index 275fa9b1427fd..b7a9e757a3afc 100644
--- a/test/codesize/test_codesize_cxx_lto.json
+++ b/test/codesize/test_codesize_cxx_lto.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19009,
   "a.out.js.gz": 7829,
-  "a.out.nodebug.wasm": 106456,
-  "a.out.nodebug.wasm.gz": 42570,
-  "total": 125465,
-  "total_gz": 50399,
+  "a.out.nodebug.wasm": 106439,
+  "a.out.nodebug.wasm.gz": 42591,
+  "total": 125448,
+  "total_gz": 50420,
   "sent": [
     "a (emscripten_resize_heap)",
     "b (_setitimer_js)",
diff --git a/test/codesize/test_codesize_cxx_mangle.json b/test/codesize/test_codesize_cxx_mangle.json
index 971f2a699af63..2b7f4d6cee050 100644
--- a/test/codesize/test_codesize_cxx_mangle.json
+++ b/test/codesize/test_codesize_cxx_mangle.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 23375,
   "a.out.js.gz": 9148,
-  "a.out.nodebug.wasm": 235283,
-  "a.out.nodebug.wasm.gz": 78886,
-  "total": 258658,
-  "total_gz": 88034,
+  "a.out.nodebug.wasm": 235343,
+  "a.out.nodebug.wasm.gz": 78952,
+  "total": 258718,
+  "total_gz": 88100,
   "sent": [
     "__cxa_begin_catch",
     "__cxa_end_catch",
diff --git a/test/codesize/test_codesize_cxx_noexcept.json b/test/codesize/test_codesize_cxx_noexcept.json
index ec1777accaf00..ae4ac3fbb7d92 100644
--- a/test/codesize/test_codesize_cxx_noexcept.json
+++ b/test/codesize/test_codesize_cxx_noexcept.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19670,
   "a.out.js.gz": 8152,
-  "a.out.nodebug.wasm": 131871,
-  "a.out.nodebug.wasm.gz": 50163,
-  "total": 151541,
-  "total_gz": 58315,
+  "a.out.nodebug.wasm": 131920,
+  "a.out.nodebug.wasm.gz": 50242,
+  "total": 151590,
+  "total_gz": 58394,
   "sent": [
     "__cxa_throw",
     "_abort_js",
diff --git a/test/codesize/test_codesize_cxx_wasmfs.json b/test/codesize/test_codesize_cxx_wasmfs.json
index 6054a8b3e5f2c..ea758037385fb 100644
--- a/test/codesize/test_codesize_cxx_wasmfs.json
+++ b/test/codesize/test_codesize_cxx_wasmfs.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 7059,
   "a.out.js.gz": 3330,
-  "a.out.nodebug.wasm": 169659,
-  "a.out.nodebug.wasm.gz": 62903,
-  "total": 176718,
-  "total_gz": 66233,
+  "a.out.nodebug.wasm": 169853,
+  "a.out.nodebug.wasm.gz": 62997,
+  "total": 176912,
+  "total_gz": 66327,
   "sent": [
     "__cxa_throw",
     "_abort_js",
diff --git a/test/codesize/test_codesize_files_wasmfs.json b/test/codesize/test_codesize_files_wasmfs.json
index 89726f92c3b18..dd6a38c659575 100644
--- a/test/codesize/test_codesize_files_wasmfs.json
+++ b/test/codesize/test_codesize_files_wasmfs.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 5465,
   "a.out.js.gz": 2576,
-  "a.out.nodebug.wasm": 50214,
-  "a.out.nodebug.wasm.gz": 18070,
-  "total": 55679,
-  "total_gz": 20646,
+  "a.out.nodebug.wasm": 50353,
+  "a.out.nodebug.wasm.gz": 18097,
+  "total": 55818,
+  "total_gz": 20673,
   "sent": [
     "a (emscripten_date_now)",
     "b (emscripten_err)",
diff --git a/test/codesize/test_codesize_hello_O0.json b/test/codesize/test_codesize_hello_O0.json
index ba98f374337cd..5e8904daa059a 100644
--- a/test/codesize/test_codesize_hello_O0.json
+++ b/test/codesize/test_codesize_hello_O0.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 24194,
   "a.out.js.gz": 8693,
-  "a.out.nodebug.wasm": 15132,
-  "a.out.nodebug.wasm.gz": 7452,
-  "total": 39326,
-  "total_gz": 16145,
+  "a.out.nodebug.wasm": 15168,
+  "a.out.nodebug.wasm.gz": 7488,
+  "total": 39362,
+  "total_gz": 16181,
   "sent": [
     "fd_write"
   ],
diff --git a/test/codesize/test_codesize_hello_dylink.json b/test/codesize/test_codesize_hello_dylink.json
index 78061e2d6e97e..52d828e202dce 100644
--- a/test/codesize/test_codesize_hello_dylink.json
+++ b/test/codesize/test_codesize_hello_dylink.json
@@ -1,10 +1,10 @@
 {
-  "a.out.js": 26592,
-  "a.out.js.gz": 11362,
+  "a.out.js": 26712,
+  "a.out.js.gz": 11400,
   "a.out.nodebug.wasm": 17757,
   "a.out.nodebug.wasm.gz": 8972,
-  "total": 44349,
-  "total_gz": 20334,
+  "total": 44469,
+  "total_gz": 20372,
   "sent": [
     "__syscall_stat64",
     "emscripten_resize_heap",
diff --git a/test/codesize/test_codesize_hello_dylink_all.json b/test/codesize/test_codesize_hello_dylink_all.json
index 5ba64ae9ce9e7..7068e4a877c50 100644
--- a/test/codesize/test_codesize_hello_dylink_all.json
+++ b/test/codesize/test_codesize_hello_dylink_all.json
@@ -1,7 +1,7 @@
 {
-  "a.out.js": 245524,
-  "a.out.nodebug.wasm": 574042,
-  "total": 819566,
+  "a.out.js": 245720,
+  "a.out.nodebug.wasm": 574286,
+  "total": 820006,
   "sent": [
     "IMG_Init",
     "IMG_Load",
@@ -270,6 +270,9 @@
     "_dlsym_js",
     "_emscripten_dlopen_js",
     "_emscripten_fs_load_embedded_files",
+    "_emscripten_get_last_devicemotion_event",
+    "_emscripten_get_last_deviceorientation_event",
+    "_emscripten_get_last_mouse_event",
     "_emscripten_get_now_is_monotonic",
     "_emscripten_get_progname",
     "_emscripten_log_formatted",
@@ -461,14 +464,11 @@
     "emscripten_get_canvas_size",
     "emscripten_get_compiler_setting",
     "emscripten_get_device_pixel_ratio",
-    "emscripten_get_devicemotion_status",
-    "emscripten_get_deviceorientation_status",
     "emscripten_get_element_css_size",
     "emscripten_get_fullscreen_status",
     "emscripten_get_gamepad_status",
     "emscripten_get_heap_max",
     "emscripten_get_main_loop_timing",
-    "emscripten_get_mouse_status",
     "emscripten_get_now",
     "emscripten_get_now_res",
     "emscripten_get_num_gamepads",
@@ -681,6 +681,7 @@
     "emscripten_has_asyncify",
     "emscripten_hide_mouse",
     "emscripten_html5_remove_all_event_listeners",
+    "emscripten_html5_remove_event_listener",
     "emscripten_idb_async_clear",
     "emscripten_idb_async_delete",
     "emscripten_idb_async_exists",
@@ -1457,6 +1458,9 @@
     "env._dlopen_js",
     "env._dlsym_js",
     "env._emscripten_dlopen_js",
+    "env._emscripten_get_last_devicemotion_event",
+    "env._emscripten_get_last_deviceorientation_event",
+    "env._emscripten_get_last_mouse_event",
     "env._emscripten_get_progname",
     "env._emscripten_log_formatted",
     "env._emscripten_lookup_name",
@@ -2220,7 +2224,10 @@
     "emscripten_fiber_init_from_current_context",
     "emscripten_futex_wait",
     "emscripten_futex_wake",
+    "emscripten_get_devicemotion_status",
+    "emscripten_get_deviceorientation_status",
     "emscripten_get_heap_size",
+    "emscripten_get_mouse_status",
     "emscripten_get_sbrk_ptr",
     "emscripten_has_threading_support",
     "emscripten_is_main_runtime_thread",
@@ -4082,7 +4089,10 @@
     "$emscripten_fiber_init",
     "$emscripten_fiber_init_from_current_context",
     "$emscripten_futex_wait",
+    "$emscripten_get_devicemotion_status",
+    "$emscripten_get_deviceorientation_status",
     "$emscripten_get_heap_size",
+    "$emscripten_get_mouse_status",
     "$emscripten_get_sbrk_ptr",
     "$emscripten_log",
     "$emscripten_longjmp",
diff --git a/test/codesize/test_codesize_mem_O3.json b/test/codesize/test_codesize_mem_O3.json
index aeb6710e5e769..fb15e671b5313 100644
--- a/test/codesize/test_codesize_mem_O3.json
+++ b/test/codesize/test_codesize_mem_O3.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 4350,
   "a.out.js.gz": 2094,
-  "a.out.nodebug.wasm": 5262,
-  "a.out.nodebug.wasm.gz": 2420,
-  "total": 9612,
-  "total_gz": 4514,
+  "a.out.nodebug.wasm": 5260,
+  "a.out.nodebug.wasm.gz": 2418,
+  "total": 9610,
+  "total_gz": 4512,
   "sent": [
     "a (emscripten_resize_heap)"
   ],
diff --git a/test/codesize/test_codesize_mem_O3_grow.json b/test/codesize/test_codesize_mem_O3_grow.json
index 38dfe7cc067cc..58a83589cb501 100644
--- a/test/codesize/test_codesize_mem_O3_grow.json
+++ b/test/codesize/test_codesize_mem_O3_grow.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 4635,
   "a.out.js.gz": 2243,
-  "a.out.nodebug.wasm": 5263,
-  "a.out.nodebug.wasm.gz": 2420,
-  "total": 9898,
-  "total_gz": 4663,
+  "a.out.nodebug.wasm": 5261,
+  "a.out.nodebug.wasm.gz": 2418,
+  "total": 9896,
+  "total_gz": 4661,
   "sent": [
     "a (emscripten_resize_heap)"
   ],
diff --git a/test/codesize/test_codesize_mem_O3_grow_standalone.json b/test/codesize/test_codesize_mem_O3_grow_standalone.json
index 29756ef1543dc..e46cc9658531b 100644
--- a/test/codesize/test_codesize_mem_O3_grow_standalone.json
+++ b/test/codesize/test_codesize_mem_O3_grow_standalone.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 4102,
   "a.out.js.gz": 1990,
-  "a.out.nodebug.wasm": 5549,
-  "a.out.nodebug.wasm.gz": 2596,
-  "total": 9651,
-  "total_gz": 4586,
+  "a.out.nodebug.wasm": 5547,
+  "a.out.nodebug.wasm.gz": 2597,
+  "total": 9649,
+  "total_gz": 4587,
   "sent": [
     "args_get",
     "args_sizes_get",
diff --git a/test/codesize/test_codesize_mem_O3_standalone.json b/test/codesize/test_codesize_mem_O3_standalone.json
index 58ca55cb2d82e..3b151aa1fa531 100644
--- a/test/codesize/test_codesize_mem_O3_standalone.json
+++ b/test/codesize/test_codesize_mem_O3_standalone.json
@@ -1,9 +1,9 @@
 {
   "a.out.js": 4035,
   "a.out.js.gz": 1954,
-  "a.out.nodebug.wasm": 5474,
+  "a.out.nodebug.wasm": 5472,
   "a.out.nodebug.wasm.gz": 2538,
-  "total": 9509,
+  "total": 9507,
   "total_gz": 4492,
   "sent": [
     "args_get",
diff --git a/test/codesize/test_codesize_mem_O3_standalone_lib.json b/test/codesize/test_codesize_mem_O3_standalone_lib.json
index e8f50185df240..e6038e024a9ee 100644
--- a/test/codesize/test_codesize_mem_O3_standalone_lib.json
+++ b/test/codesize/test_codesize_mem_O3_standalone_lib.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 3563,
   "a.out.js.gz": 1689,
-  "a.out.nodebug.wasm": 5241,
-  "a.out.nodebug.wasm.gz": 2357,
-  "total": 8804,
-  "total_gz": 4046,
+  "a.out.nodebug.wasm": 5239,
+  "a.out.nodebug.wasm.gz": 2360,
+  "total": 8802,
+  "total_gz": 4049,
   "sent": [],
   "imports": [],
   "exports": [
diff --git a/test/codesize/test_codesize_mem_O3_standalone_narg.json b/test/codesize/test_codesize_mem_O3_standalone_narg.json
index 2572c38383ec6..ccfba4a468a28 100644
--- a/test/codesize/test_codesize_mem_O3_standalone_narg.json
+++ b/test/codesize/test_codesize_mem_O3_standalone_narg.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 3570,
   "a.out.js.gz": 1701,
-  "a.out.nodebug.wasm": 5267,
-  "a.out.nodebug.wasm.gz": 2394,
-  "total": 8837,
-  "total_gz": 4095,
+  "a.out.nodebug.wasm": 5265,
+  "a.out.nodebug.wasm.gz": 2397,
+  "total": 8835,
+  "total_gz": 4098,
   "sent": [
     "proc_exit"
   ],
diff --git a/test/codesize/test_codesize_mem_O3_standalone_narg_flto.json b/test/codesize/test_codesize_mem_O3_standalone_narg_flto.json
index 913e963329b60..322ae921f0b30 100644
--- a/test/codesize/test_codesize_mem_O3_standalone_narg_flto.json
+++ b/test/codesize/test_codesize_mem_O3_standalone_narg_flto.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 3570,
   "a.out.js.gz": 1701,
-  "a.out.nodebug.wasm": 4079,
-  "a.out.nodebug.wasm.gz": 2025,
-  "total": 7649,
-  "total_gz": 3726,
+  "a.out.nodebug.wasm": 4077,
+  "a.out.nodebug.wasm.gz": 2031,
+  "total": 7647,
+  "total_gz": 3732,
   "sent": [
     "proc_exit"
   ],
diff --git a/test/codesize/test_codesize_minimal_pthreads.json b/test/codesize/test_codesize_minimal_pthreads.json
index d83a9d6908e59..df29538dd4722 100644
--- a/test/codesize/test_codesize_minimal_pthreads.json
+++ b/test/codesize/test_codesize_minimal_pthreads.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 7611,
   "a.out.js.gz": 3764,
-  "a.out.nodebug.wasm": 19615,
-  "a.out.nodebug.wasm.gz": 9076,
-  "total": 27226,
-  "total_gz": 12840,
+  "a.out.nodebug.wasm": 19609,
+  "a.out.nodebug.wasm.gz": 9071,
+  "total": 27220,
+  "total_gz": 12835,
   "sent": [
     "a (memory)",
     "b (emscripten_get_now)",
diff --git a/test/codesize/test_codesize_minimal_pthreads_memgrowth.json b/test/codesize/test_codesize_minimal_pthreads_memgrowth.json
index 37ed60cabc988..27d66057145e3 100644
--- a/test/codesize/test_codesize_minimal_pthreads_memgrowth.json
+++ b/test/codesize/test_codesize_minimal_pthreads_memgrowth.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 8038,
   "a.out.js.gz": 3964,
-  "a.out.nodebug.wasm": 19616,
-  "a.out.nodebug.wasm.gz": 9077,
-  "total": 27654,
-  "total_gz": 13041,
+  "a.out.nodebug.wasm": 19610,
+  "a.out.nodebug.wasm.gz": 9072,
+  "total": 27648,
+  "total_gz": 13036,
   "sent": [
     "a (memory)",
     "b (emscripten_get_now)",
diff --git a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm.json b/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm.json
index e8a6f4c89facc..1d93a5fc32ae1 100644
--- a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm.json
+++ b/test/codesize/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": 8310,
-  "a.wasm.gz": 5652,
-  "total": 13201,
-  "total_gz": 8254
+  "a.wasm": 8313,
+  "a.wasm.gz": 5669,
+  "total": 13204,
+  "total_gz": 8271
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm2js.json b/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm2js.json
index 36beab711ea0f..50279d69b2c8b 100644
--- a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm2js.json
+++ b/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm2js.json
@@ -1,8 +1,8 @@
 {
   "a.html": 346,
   "a.html.gz": 255,
-  "a.js": 18193,
-  "a.js.gz": 9822,
-  "total": 18539,
-  "total_gz": 10077
+  "a.js": 18208,
+  "a.js.gz": 9836,
+  "total": 18554,
+  "total_gz": 10091
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm_singlefile.json b/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm_singlefile.json
index f5ac3fea3e2d2..873fcdab7a2c7 100644
--- a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm_singlefile.json
+++ b/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm_singlefile.json
@@ -1,4 +1,4 @@
 {
-  "a.html": 15136,
-  "a.html.gz": 9084
+  "a.html": 15147,
+  "a.html.gz": 9111
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm.json b/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm.json
index 04621bf44b0d5..f7cdc47c6763e 100644
--- a/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm.json
+++ b/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 321,
   "a.js": 3975,
   "a.js.gz": 2123,
-  "a.wasm": 8310,
-  "a.wasm.gz": 5652,
-  "total": 12739,
-  "total_gz": 8096
+  "a.wasm": 8313,
+  "a.wasm.gz": 5669,
+  "total": 12742,
+  "total_gz": 8113
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm2js.json b/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm2js.json
index f6e48292a5d18..d1bd3d803b3b4 100644
--- a/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm2js.json
+++ b/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm2js.json
@@ -1,8 +1,8 @@
 {
   "a.html": 346,
   "a.html.gz": 255,
-  "a.js": 17720,
-  "a.js.gz": 9662,
-  "total": 18066,
-  "total_gz": 9917
+  "a.js": 17735,
+  "a.js.gz": 9677,
+  "total": 18081,
+  "total_gz": 9932
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_random_printf_wasm.json b/test/codesize/test_minimal_runtime_code_size_random_printf_wasm.json
index bde88665666a5..a48c21aba3f37 100644
--- a/test/codesize/test_minimal_runtime_code_size_random_printf_wasm.json
+++ b/test/codesize/test_minimal_runtime_code_size_random_printf_wasm.json
@@ -1,4 +1,4 @@
 {
-  "a.html": 10980,
-  "a.html.gz": 5738
+  "a.html": 10993,
+  "a.html.gz": 5767
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_random_printf_wasm2js.json b/test/codesize/test_minimal_runtime_code_size_random_printf_wasm2js.json
index 84818c29a04bb..55501935ef88c 100644
--- a/test/codesize/test_minimal_runtime_code_size_random_printf_wasm2js.json
+++ b/test/codesize/test_minimal_runtime_code_size_random_printf_wasm2js.json
@@ -1,4 +1,4 @@
 {
-  "a.html": 17169,
-  "a.html.gz": 7508
+  "a.html": 17229,
+  "a.html.gz": 7534
 }
diff --git a/test/codesize/test_unoptimized_code_size.json b/test/codesize/test_unoptimized_code_size.json
index 75ecab2af85fe..b9cabfcf0c540 100644
--- a/test/codesize/test_unoptimized_code_size.json
+++ b/test/codesize/test_unoptimized_code_size.json
@@ -1,16 +1,16 @@
 {
   "hello_world.js": 56928,
   "hello_world.js.gz": 17707,
-  "hello_world.wasm": 15132,
-  "hello_world.wasm.gz": 7452,
+  "hello_world.wasm": 15168,
+  "hello_world.wasm.gz": 7488,
   "no_asserts.js": 26632,
   "no_asserts.js.gz": 8884,
-  "no_asserts.wasm": 12181,
-  "no_asserts.wasm.gz": 5981,
+  "no_asserts.wasm": 12217,
+  "no_asserts.wasm.gz": 6015,
   "strict.js": 54943,
   "strict.js.gz": 17053,
-  "strict.wasm": 15132,
-  "strict.wasm.gz": 7447,
-  "total": 180948,
-  "total_gz": 64524
+  "strict.wasm": 15168,
+  "strict.wasm.gz": 7482,
+  "total": 181056,
+  "total_gz": 64629
 }

From e0fda6d29ff75f75fb762e55ec5fdb58b17ad673 Mon Sep 17 00:00:00 2001
From: ryanking13 <def6488@gmail.com>
Date: Fri, 21 Nov 2025 14:02:47 +0900
Subject: [PATCH 15/18] Automatic rebaseline of codesize expectations. NFC

This is an automatic change generated by tools/maint/rebaseline_tests.py.

The following (2) test expectation files were updated by
running the tests with `--rebaseline`:

```
codesize/test_codesize_cxx_lto.json: 125448 => 125450 [+2 bytes / +0.00%]
codesize/test_unoptimized_code_size.json: 180908 => 181016 [+108 bytes / +0.06%]

Average change: +0.03% (+0.00% - +0.06%)
```
---
 test/codesize/test_codesize_cxx_lto.json      |  8 ++++----
 test/codesize/test_unoptimized_code_size.json | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/codesize/test_codesize_cxx_lto.json b/test/codesize/test_codesize_cxx_lto.json
index b7a9e757a3afc..676c7a4cc6ff7 100644
--- a/test/codesize/test_codesize_cxx_lto.json
+++ b/test/codesize/test_codesize_cxx_lto.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19009,
   "a.out.js.gz": 7829,
-  "a.out.nodebug.wasm": 106439,
-  "a.out.nodebug.wasm.gz": 42591,
-  "total": 125448,
-  "total_gz": 50420,
+  "a.out.nodebug.wasm": 106441,
+  "a.out.nodebug.wasm.gz": 42554,
+  "total": 125450,
+  "total_gz": 50383,
   "sent": [
     "a (emscripten_resize_heap)",
     "b (_setitimer_js)",
diff --git a/test/codesize/test_unoptimized_code_size.json b/test/codesize/test_unoptimized_code_size.json
index 38553722bf9d6..73a5d77d8a0b8 100644
--- a/test/codesize/test_unoptimized_code_size.json
+++ b/test/codesize/test_unoptimized_code_size.json
@@ -1,16 +1,16 @@
 {
   "hello_world.js": 56928,
   "hello_world.js.gz": 17707,
-  "hello_world.wasm": 15132,
-  "hello_world.wasm.gz": 7452,
+  "hello_world.wasm": 15168,
+  "hello_world.wasm.gz": 7488,
   "no_asserts.js": 26632,
   "no_asserts.js.gz": 8884,
-  "no_asserts.wasm": 12181,
-  "no_asserts.wasm.gz": 5981,
+  "no_asserts.wasm": 12217,
+  "no_asserts.wasm.gz": 6015,
   "strict.js": 54903,
   "strict.js.gz": 17041,
-  "strict.wasm": 15132,
-  "strict.wasm.gz": 7447,
-  "total": 180908,
-  "total_gz": 64512
+  "strict.wasm": 15168,
+  "strict.wasm.gz": 7482,
+  "total": 181016,
+  "total_gz": 64617
 }

From 1680a0ea6284f9f4e1770803594ae04bd76849f1 Mon Sep 17 00:00:00 2001
From: ryanking13 <def6488@gmail.com>
Date: Fri, 21 Nov 2025 16:06:59 +0900
Subject: [PATCH 16/18] Automatic rebaseline of codesize expectations. NFC

This is an automatic change generated by tools/maint/rebaseline_tests.py.

The following (26) test expectation files were updated by
running the tests with `--rebaseline`:

```
codesize/test_codesize_cxx_ctors1.json: 149173 => 149124 [-49 bytes / -0.03%]
codesize/test_codesize_cxx_ctors2.json: 148577 => 148528 [-49 bytes / -0.03%]
codesize/test_codesize_cxx_except.json: 194636 => 194587 [-49 bytes / -0.03%]
codesize/test_codesize_cxx_except_wasm.json: 164153 => 164104 [-49 bytes / -0.03%]
codesize/test_codesize_cxx_except_wasm_legacy.json: 161811 => 161762 [-49 bytes / -0.03%]
codesize/test_codesize_cxx_mangle.json: 258718 => 258658 [-60 bytes / -0.02%]
codesize/test_codesize_cxx_noexcept.json: 151590 => 151541 [-49 bytes / -0.03%]
codesize/test_codesize_cxx_wasmfs.json: 176912 => 176718 [-194 bytes / -0.11%]
codesize/test_codesize_files_wasmfs.json: 55818 => 55679 [-139 bytes / -0.25%]
codesize/test_codesize_hello_O0.json: 39362 => 39326 [-36 bytes / -0.09%]
codesize/test_codesize_mem_O3.json: 9610 => 9612 [+2 bytes / +0.02%]
codesize/test_codesize_mem_O3_grow.json: 9896 => 9898 [+2 bytes / +0.02%]
codesize/test_codesize_mem_O3_grow_standalone.json: 9649 => 9651 [+2 bytes / +0.02%]
codesize/test_codesize_mem_O3_standalone.json: 9507 => 9509 [+2 bytes / +0.02%]
codesize/test_codesize_mem_O3_standalone_lib.json: 8802 => 8804 [+2 bytes / +0.02%]
codesize/test_codesize_mem_O3_standalone_narg.json: 8835 => 8837 [+2 bytes / +0.02%]
codesize/test_codesize_minimal_pthreads.json: 27220 => 27226 [+6 bytes / +0.02%]
codesize/test_codesize_minimal_pthreads_memgrowth.json: 27648 => 27654 [+6 bytes / +0.02%]
codesize/test_minimal_runtime_code_size_hello_webgl2_wasm.json: 13204 => 13201 [-3 bytes / -0.02%]
codesize/test_minimal_runtime_code_size_hello_webgl2_wasm2js.json: 18554 => 18539 [-15 bytes / -0.08%]
codesize/test_minimal_runtime_code_size_hello_webgl2_wasm_singlefile.json: 15147 => 15136 [-11 bytes / -0.07%]
codesize/test_minimal_runtime_code_size_hello_webgl_wasm.json: 12742 => 12739 [-3 bytes / -0.02%]
codesize/test_minimal_runtime_code_size_hello_webgl_wasm2js.json: 18081 => 18066 [-15 bytes / -0.08%]
codesize/test_minimal_runtime_code_size_random_printf_wasm.json: 10993 => 10980 [-13 bytes / -0.12%]
codesize/test_minimal_runtime_code_size_random_printf_wasm2js.json: 17229 => 17169 [-60 bytes / -0.35%]
codesize/test_unoptimized_code_size.json: 181016 => 180908 [-108 bytes / -0.06%]

Average change: -0.05% (-0.35% - +0.02%)
```
---
 test/codesize/test_codesize_cxx_ctors1.json      |  8 ++++----
 test/codesize/test_codesize_cxx_ctors2.json      |  8 ++++----
 test/codesize/test_codesize_cxx_except.json      |  8 ++++----
 test/codesize/test_codesize_cxx_except_wasm.json |  8 ++++----
 .../test_codesize_cxx_except_wasm_legacy.json    |  8 ++++----
 test/codesize/test_codesize_cxx_mangle.json      |  8 ++++----
 test/codesize/test_codesize_cxx_noexcept.json    |  8 ++++----
 test/codesize/test_codesize_cxx_wasmfs.json      |  8 ++++----
 test/codesize/test_codesize_files_wasmfs.json    |  8 ++++----
 test/codesize/test_codesize_hello_O0.json        |  8 ++++----
 test/codesize/test_codesize_mem_O3.json          |  8 ++++----
 test/codesize/test_codesize_mem_O3_grow.json     |  8 ++++----
 .../test_codesize_mem_O3_grow_standalone.json    |  8 ++++----
 .../test_codesize_mem_O3_standalone.json         |  4 ++--
 .../test_codesize_mem_O3_standalone_lib.json     |  8 ++++----
 .../test_codesize_mem_O3_standalone_narg.json    |  8 ++++----
 .../codesize/test_codesize_minimal_pthreads.json |  8 ++++----
 ...test_codesize_minimal_pthreads_memgrowth.json |  8 ++++----
 ...imal_runtime_code_size_hello_webgl2_wasm.json |  8 ++++----
 ...l_runtime_code_size_hello_webgl2_wasm2js.json |  8 ++++----
 ...e_code_size_hello_webgl2_wasm_singlefile.json |  4 ++--
 ...nimal_runtime_code_size_hello_webgl_wasm.json |  8 ++++----
 ...al_runtime_code_size_hello_webgl_wasm2js.json |  8 ++++----
 ...mal_runtime_code_size_random_printf_wasm.json |  4 ++--
 ..._runtime_code_size_random_printf_wasm2js.json |  4 ++--
 test/codesize/test_unoptimized_code_size.json    | 16 ++++++++--------
 26 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/test/codesize/test_codesize_cxx_ctors1.json b/test/codesize/test_codesize_cxx_ctors1.json
index f47f641d6f030..39f780350e871 100644
--- a/test/codesize/test_codesize_cxx_ctors1.json
+++ b/test/codesize/test_codesize_cxx_ctors1.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19670,
   "a.out.js.gz": 8152,
-  "a.out.nodebug.wasm": 129503,
-  "a.out.nodebug.wasm.gz": 49248,
-  "total": 149173,
-  "total_gz": 57400,
+  "a.out.nodebug.wasm": 129454,
+  "a.out.nodebug.wasm.gz": 49164,
+  "total": 149124,
+  "total_gz": 57316,
   "sent": [
     "__cxa_throw",
     "_abort_js",
diff --git a/test/codesize/test_codesize_cxx_ctors2.json b/test/codesize/test_codesize_cxx_ctors2.json
index d49c9f1b6096c..f6d061142c8de 100644
--- a/test/codesize/test_codesize_cxx_ctors2.json
+++ b/test/codesize/test_codesize_cxx_ctors2.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19647,
   "a.out.js.gz": 8139,
-  "a.out.nodebug.wasm": 128930,
-  "a.out.nodebug.wasm.gz": 48886,
-  "total": 148577,
-  "total_gz": 57025,
+  "a.out.nodebug.wasm": 128881,
+  "a.out.nodebug.wasm.gz": 48809,
+  "total": 148528,
+  "total_gz": 56948,
   "sent": [
     "__cxa_throw",
     "_abort_js",
diff --git a/test/codesize/test_codesize_cxx_except.json b/test/codesize/test_codesize_cxx_except.json
index 4dde3d8ee470a..b42030f733bf7 100644
--- a/test/codesize/test_codesize_cxx_except.json
+++ b/test/codesize/test_codesize_cxx_except.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 23325,
   "a.out.js.gz": 9128,
-  "a.out.nodebug.wasm": 171311,
-  "a.out.nodebug.wasm.gz": 57348,
-  "total": 194636,
-  "total_gz": 66476,
+  "a.out.nodebug.wasm": 171262,
+  "a.out.nodebug.wasm.gz": 57278,
+  "total": 194587,
+  "total_gz": 66406,
   "sent": [
     "__cxa_begin_catch",
     "__cxa_end_catch",
diff --git a/test/codesize/test_codesize_cxx_except_wasm.json b/test/codesize/test_codesize_cxx_except_wasm.json
index 12f821fb72467..d36e2053e9471 100644
--- a/test/codesize/test_codesize_cxx_except_wasm.json
+++ b/test/codesize/test_codesize_cxx_except_wasm.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19486,
   "a.out.js.gz": 8077,
-  "a.out.nodebug.wasm": 144667,
-  "a.out.nodebug.wasm.gz": 54907,
-  "total": 164153,
-  "total_gz": 62984,
+  "a.out.nodebug.wasm": 144618,
+  "a.out.nodebug.wasm.gz": 54850,
+  "total": 164104,
+  "total_gz": 62927,
   "sent": [
     "_abort_js",
     "_tzset_js",
diff --git a/test/codesize/test_codesize_cxx_except_wasm_legacy.json b/test/codesize/test_codesize_cxx_except_wasm_legacy.json
index 89914a35b80ab..a169b35ce787a 100644
--- a/test/codesize/test_codesize_cxx_except_wasm_legacy.json
+++ b/test/codesize/test_codesize_cxx_except_wasm_legacy.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19555,
   "a.out.js.gz": 8099,
-  "a.out.nodebug.wasm": 142256,
-  "a.out.nodebug.wasm.gz": 54366,
-  "total": 161811,
-  "total_gz": 62465,
+  "a.out.nodebug.wasm": 142207,
+  "a.out.nodebug.wasm.gz": 54300,
+  "total": 161762,
+  "total_gz": 62399,
   "sent": [
     "_abort_js",
     "_tzset_js",
diff --git a/test/codesize/test_codesize_cxx_mangle.json b/test/codesize/test_codesize_cxx_mangle.json
index 2b7f4d6cee050..971f2a699af63 100644
--- a/test/codesize/test_codesize_cxx_mangle.json
+++ b/test/codesize/test_codesize_cxx_mangle.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 23375,
   "a.out.js.gz": 9148,
-  "a.out.nodebug.wasm": 235343,
-  "a.out.nodebug.wasm.gz": 78952,
-  "total": 258718,
-  "total_gz": 88100,
+  "a.out.nodebug.wasm": 235283,
+  "a.out.nodebug.wasm.gz": 78886,
+  "total": 258658,
+  "total_gz": 88034,
   "sent": [
     "__cxa_begin_catch",
     "__cxa_end_catch",
diff --git a/test/codesize/test_codesize_cxx_noexcept.json b/test/codesize/test_codesize_cxx_noexcept.json
index ae4ac3fbb7d92..ec1777accaf00 100644
--- a/test/codesize/test_codesize_cxx_noexcept.json
+++ b/test/codesize/test_codesize_cxx_noexcept.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19670,
   "a.out.js.gz": 8152,
-  "a.out.nodebug.wasm": 131920,
-  "a.out.nodebug.wasm.gz": 50242,
-  "total": 151590,
-  "total_gz": 58394,
+  "a.out.nodebug.wasm": 131871,
+  "a.out.nodebug.wasm.gz": 50163,
+  "total": 151541,
+  "total_gz": 58315,
   "sent": [
     "__cxa_throw",
     "_abort_js",
diff --git a/test/codesize/test_codesize_cxx_wasmfs.json b/test/codesize/test_codesize_cxx_wasmfs.json
index ea758037385fb..6054a8b3e5f2c 100644
--- a/test/codesize/test_codesize_cxx_wasmfs.json
+++ b/test/codesize/test_codesize_cxx_wasmfs.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 7059,
   "a.out.js.gz": 3330,
-  "a.out.nodebug.wasm": 169853,
-  "a.out.nodebug.wasm.gz": 62997,
-  "total": 176912,
-  "total_gz": 66327,
+  "a.out.nodebug.wasm": 169659,
+  "a.out.nodebug.wasm.gz": 62903,
+  "total": 176718,
+  "total_gz": 66233,
   "sent": [
     "__cxa_throw",
     "_abort_js",
diff --git a/test/codesize/test_codesize_files_wasmfs.json b/test/codesize/test_codesize_files_wasmfs.json
index dd6a38c659575..89726f92c3b18 100644
--- a/test/codesize/test_codesize_files_wasmfs.json
+++ b/test/codesize/test_codesize_files_wasmfs.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 5465,
   "a.out.js.gz": 2576,
-  "a.out.nodebug.wasm": 50353,
-  "a.out.nodebug.wasm.gz": 18097,
-  "total": 55818,
-  "total_gz": 20673,
+  "a.out.nodebug.wasm": 50214,
+  "a.out.nodebug.wasm.gz": 18070,
+  "total": 55679,
+  "total_gz": 20646,
   "sent": [
     "a (emscripten_date_now)",
     "b (emscripten_err)",
diff --git a/test/codesize/test_codesize_hello_O0.json b/test/codesize/test_codesize_hello_O0.json
index 5e8904daa059a..ba98f374337cd 100644
--- a/test/codesize/test_codesize_hello_O0.json
+++ b/test/codesize/test_codesize_hello_O0.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 24194,
   "a.out.js.gz": 8693,
-  "a.out.nodebug.wasm": 15168,
-  "a.out.nodebug.wasm.gz": 7488,
-  "total": 39362,
-  "total_gz": 16181,
+  "a.out.nodebug.wasm": 15132,
+  "a.out.nodebug.wasm.gz": 7452,
+  "total": 39326,
+  "total_gz": 16145,
   "sent": [
     "fd_write"
   ],
diff --git a/test/codesize/test_codesize_mem_O3.json b/test/codesize/test_codesize_mem_O3.json
index fb15e671b5313..aeb6710e5e769 100644
--- a/test/codesize/test_codesize_mem_O3.json
+++ b/test/codesize/test_codesize_mem_O3.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 4350,
   "a.out.js.gz": 2094,
-  "a.out.nodebug.wasm": 5260,
-  "a.out.nodebug.wasm.gz": 2418,
-  "total": 9610,
-  "total_gz": 4512,
+  "a.out.nodebug.wasm": 5262,
+  "a.out.nodebug.wasm.gz": 2420,
+  "total": 9612,
+  "total_gz": 4514,
   "sent": [
     "a (emscripten_resize_heap)"
   ],
diff --git a/test/codesize/test_codesize_mem_O3_grow.json b/test/codesize/test_codesize_mem_O3_grow.json
index 58a83589cb501..38dfe7cc067cc 100644
--- a/test/codesize/test_codesize_mem_O3_grow.json
+++ b/test/codesize/test_codesize_mem_O3_grow.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 4635,
   "a.out.js.gz": 2243,
-  "a.out.nodebug.wasm": 5261,
-  "a.out.nodebug.wasm.gz": 2418,
-  "total": 9896,
-  "total_gz": 4661,
+  "a.out.nodebug.wasm": 5263,
+  "a.out.nodebug.wasm.gz": 2420,
+  "total": 9898,
+  "total_gz": 4663,
   "sent": [
     "a (emscripten_resize_heap)"
   ],
diff --git a/test/codesize/test_codesize_mem_O3_grow_standalone.json b/test/codesize/test_codesize_mem_O3_grow_standalone.json
index e46cc9658531b..29756ef1543dc 100644
--- a/test/codesize/test_codesize_mem_O3_grow_standalone.json
+++ b/test/codesize/test_codesize_mem_O3_grow_standalone.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 4102,
   "a.out.js.gz": 1990,
-  "a.out.nodebug.wasm": 5547,
-  "a.out.nodebug.wasm.gz": 2597,
-  "total": 9649,
-  "total_gz": 4587,
+  "a.out.nodebug.wasm": 5549,
+  "a.out.nodebug.wasm.gz": 2596,
+  "total": 9651,
+  "total_gz": 4586,
   "sent": [
     "args_get",
     "args_sizes_get",
diff --git a/test/codesize/test_codesize_mem_O3_standalone.json b/test/codesize/test_codesize_mem_O3_standalone.json
index 3b151aa1fa531..58ca55cb2d82e 100644
--- a/test/codesize/test_codesize_mem_O3_standalone.json
+++ b/test/codesize/test_codesize_mem_O3_standalone.json
@@ -1,9 +1,9 @@
 {
   "a.out.js": 4035,
   "a.out.js.gz": 1954,
-  "a.out.nodebug.wasm": 5472,
+  "a.out.nodebug.wasm": 5474,
   "a.out.nodebug.wasm.gz": 2538,
-  "total": 9507,
+  "total": 9509,
   "total_gz": 4492,
   "sent": [
     "args_get",
diff --git a/test/codesize/test_codesize_mem_O3_standalone_lib.json b/test/codesize/test_codesize_mem_O3_standalone_lib.json
index e6038e024a9ee..e8f50185df240 100644
--- a/test/codesize/test_codesize_mem_O3_standalone_lib.json
+++ b/test/codesize/test_codesize_mem_O3_standalone_lib.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 3563,
   "a.out.js.gz": 1689,
-  "a.out.nodebug.wasm": 5239,
-  "a.out.nodebug.wasm.gz": 2360,
-  "total": 8802,
-  "total_gz": 4049,
+  "a.out.nodebug.wasm": 5241,
+  "a.out.nodebug.wasm.gz": 2357,
+  "total": 8804,
+  "total_gz": 4046,
   "sent": [],
   "imports": [],
   "exports": [
diff --git a/test/codesize/test_codesize_mem_O3_standalone_narg.json b/test/codesize/test_codesize_mem_O3_standalone_narg.json
index ccfba4a468a28..2572c38383ec6 100644
--- a/test/codesize/test_codesize_mem_O3_standalone_narg.json
+++ b/test/codesize/test_codesize_mem_O3_standalone_narg.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 3570,
   "a.out.js.gz": 1701,
-  "a.out.nodebug.wasm": 5265,
-  "a.out.nodebug.wasm.gz": 2397,
-  "total": 8835,
-  "total_gz": 4098,
+  "a.out.nodebug.wasm": 5267,
+  "a.out.nodebug.wasm.gz": 2394,
+  "total": 8837,
+  "total_gz": 4095,
   "sent": [
     "proc_exit"
   ],
diff --git a/test/codesize/test_codesize_minimal_pthreads.json b/test/codesize/test_codesize_minimal_pthreads.json
index df29538dd4722..d83a9d6908e59 100644
--- a/test/codesize/test_codesize_minimal_pthreads.json
+++ b/test/codesize/test_codesize_minimal_pthreads.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 7611,
   "a.out.js.gz": 3764,
-  "a.out.nodebug.wasm": 19609,
-  "a.out.nodebug.wasm.gz": 9071,
-  "total": 27220,
-  "total_gz": 12835,
+  "a.out.nodebug.wasm": 19615,
+  "a.out.nodebug.wasm.gz": 9076,
+  "total": 27226,
+  "total_gz": 12840,
   "sent": [
     "a (memory)",
     "b (emscripten_get_now)",
diff --git a/test/codesize/test_codesize_minimal_pthreads_memgrowth.json b/test/codesize/test_codesize_minimal_pthreads_memgrowth.json
index 27d66057145e3..37ed60cabc988 100644
--- a/test/codesize/test_codesize_minimal_pthreads_memgrowth.json
+++ b/test/codesize/test_codesize_minimal_pthreads_memgrowth.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 8038,
   "a.out.js.gz": 3964,
-  "a.out.nodebug.wasm": 19610,
-  "a.out.nodebug.wasm.gz": 9072,
-  "total": 27648,
-  "total_gz": 13036,
+  "a.out.nodebug.wasm": 19616,
+  "a.out.nodebug.wasm.gz": 9077,
+  "total": 27654,
+  "total_gz": 13041,
   "sent": [
     "a (memory)",
     "b (emscripten_get_now)",
diff --git a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm.json b/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm.json
index 1d93a5fc32ae1..e8a6f4c89facc 100644
--- a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm.json
+++ b/test/codesize/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": 8313,
-  "a.wasm.gz": 5669,
-  "total": 13204,
-  "total_gz": 8271
+  "a.wasm": 8310,
+  "a.wasm.gz": 5652,
+  "total": 13201,
+  "total_gz": 8254
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm2js.json b/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm2js.json
index 50279d69b2c8b..36beab711ea0f 100644
--- a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm2js.json
+++ b/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm2js.json
@@ -1,8 +1,8 @@
 {
   "a.html": 346,
   "a.html.gz": 255,
-  "a.js": 18208,
-  "a.js.gz": 9836,
-  "total": 18554,
-  "total_gz": 10091
+  "a.js": 18193,
+  "a.js.gz": 9822,
+  "total": 18539,
+  "total_gz": 10077
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm_singlefile.json b/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm_singlefile.json
index 873fcdab7a2c7..f5ac3fea3e2d2 100644
--- a/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm_singlefile.json
+++ b/test/codesize/test_minimal_runtime_code_size_hello_webgl2_wasm_singlefile.json
@@ -1,4 +1,4 @@
 {
-  "a.html": 15147,
-  "a.html.gz": 9111
+  "a.html": 15136,
+  "a.html.gz": 9084
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm.json b/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm.json
index f7cdc47c6763e..04621bf44b0d5 100644
--- a/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm.json
+++ b/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 321,
   "a.js": 3975,
   "a.js.gz": 2123,
-  "a.wasm": 8313,
-  "a.wasm.gz": 5669,
-  "total": 12742,
-  "total_gz": 8113
+  "a.wasm": 8310,
+  "a.wasm.gz": 5652,
+  "total": 12739,
+  "total_gz": 8096
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm2js.json b/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm2js.json
index d1bd3d803b3b4..f6e48292a5d18 100644
--- a/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm2js.json
+++ b/test/codesize/test_minimal_runtime_code_size_hello_webgl_wasm2js.json
@@ -1,8 +1,8 @@
 {
   "a.html": 346,
   "a.html.gz": 255,
-  "a.js": 17735,
-  "a.js.gz": 9677,
-  "total": 18081,
-  "total_gz": 9932
+  "a.js": 17720,
+  "a.js.gz": 9662,
+  "total": 18066,
+  "total_gz": 9917
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_random_printf_wasm.json b/test/codesize/test_minimal_runtime_code_size_random_printf_wasm.json
index a48c21aba3f37..bde88665666a5 100644
--- a/test/codesize/test_minimal_runtime_code_size_random_printf_wasm.json
+++ b/test/codesize/test_minimal_runtime_code_size_random_printf_wasm.json
@@ -1,4 +1,4 @@
 {
-  "a.html": 10993,
-  "a.html.gz": 5767
+  "a.html": 10980,
+  "a.html.gz": 5738
 }
diff --git a/test/codesize/test_minimal_runtime_code_size_random_printf_wasm2js.json b/test/codesize/test_minimal_runtime_code_size_random_printf_wasm2js.json
index 55501935ef88c..84818c29a04bb 100644
--- a/test/codesize/test_minimal_runtime_code_size_random_printf_wasm2js.json
+++ b/test/codesize/test_minimal_runtime_code_size_random_printf_wasm2js.json
@@ -1,4 +1,4 @@
 {
-  "a.html": 17229,
-  "a.html.gz": 7534
+  "a.html": 17169,
+  "a.html.gz": 7508
 }
diff --git a/test/codesize/test_unoptimized_code_size.json b/test/codesize/test_unoptimized_code_size.json
index 73a5d77d8a0b8..38553722bf9d6 100644
--- a/test/codesize/test_unoptimized_code_size.json
+++ b/test/codesize/test_unoptimized_code_size.json
@@ -1,16 +1,16 @@
 {
   "hello_world.js": 56928,
   "hello_world.js.gz": 17707,
-  "hello_world.wasm": 15168,
-  "hello_world.wasm.gz": 7488,
+  "hello_world.wasm": 15132,
+  "hello_world.wasm.gz": 7452,
   "no_asserts.js": 26632,
   "no_asserts.js.gz": 8884,
-  "no_asserts.wasm": 12217,
-  "no_asserts.wasm.gz": 6015,
+  "no_asserts.wasm": 12181,
+  "no_asserts.wasm.gz": 5981,
   "strict.js": 54903,
   "strict.js.gz": 17041,
-  "strict.wasm": 15168,
-  "strict.wasm.gz": 7482,
-  "total": 181016,
-  "total_gz": 64617
+  "strict.wasm": 15132,
+  "strict.wasm.gz": 7447,
+  "total": 180908,
+  "total_gz": 64512
 }

From 7fc0ca7462ea4b2a2c622f52babb239f49f319b6 Mon Sep 17 00:00:00 2001
From: ryanking13 <def6488@gmail.com>
Date: Fri, 21 Nov 2025 16:08:55 +0900
Subject: [PATCH 17/18] Remove codesize files that are not used anymore

---
 test/other/codesize/test_codesize_hello_dylink.gzsize | 1 -
 test/other/codesize/test_codesize_hello_dylink.jssize | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 test/other/codesize/test_codesize_hello_dylink.gzsize
 delete mode 100644 test/other/codesize/test_codesize_hello_dylink.jssize

diff --git a/test/other/codesize/test_codesize_hello_dylink.gzsize b/test/other/codesize/test_codesize_hello_dylink.gzsize
deleted file mode 100644
index c32c6049908ed..0000000000000
--- a/test/other/codesize/test_codesize_hello_dylink.gzsize
+++ /dev/null
@@ -1 +0,0 @@
-11696
diff --git a/test/other/codesize/test_codesize_hello_dylink.jssize b/test/other/codesize/test_codesize_hello_dylink.jssize
deleted file mode 100644
index f95e9327160ee..0000000000000
--- a/test/other/codesize/test_codesize_hello_dylink.jssize
+++ /dev/null
@@ -1 +0,0 @@
-27613

From df8125ed1fa4c8acb14226f18e2c2bbe34ddcb7e Mon Sep 17 00:00:00 2001
From: ryanking13 <def6488@gmail.com>
Date: Fri, 21 Nov 2025 16:54:34 +0900
Subject: [PATCH 18/18] Automatic rebaseline of codesize expectations. NFC

This is an automatic change generated by tools/maint/rebaseline_tests.py.

The following (4) test expectation files were updated by
running the tests with `--rebaseline`:

```
codesize/test_codesize_cxx_lto.json: 125450 => 125465 [+15 bytes / +0.01%]
codesize/test_codesize_hello_dylink.json: 44469 => 44463 [-6 bytes / -0.01%]
codesize/test_codesize_hello_dylink_all.json: 820006 => 819727 [-279 bytes / -0.03%]
codesize/test_codesize_mem_O3_standalone_narg_flto.json: 7647 => 7649 [+2 bytes / +0.03%]

Average change: -0.00% (-0.03% - +0.03%)
```
---
 test/codesize/test_codesize_cxx_lto.json                  | 8 ++++----
 test/codesize/test_codesize_hello_dylink.json             | 8 ++++----
 test/codesize/test_codesize_hello_dylink_all.json         | 4 ++--
 .../test_codesize_mem_O3_standalone_narg_flto.json        | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/codesize/test_codesize_cxx_lto.json b/test/codesize/test_codesize_cxx_lto.json
index 676c7a4cc6ff7..275fa9b1427fd 100644
--- a/test/codesize/test_codesize_cxx_lto.json
+++ b/test/codesize/test_codesize_cxx_lto.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 19009,
   "a.out.js.gz": 7829,
-  "a.out.nodebug.wasm": 106441,
-  "a.out.nodebug.wasm.gz": 42554,
-  "total": 125450,
-  "total_gz": 50383,
+  "a.out.nodebug.wasm": 106456,
+  "a.out.nodebug.wasm.gz": 42570,
+  "total": 125465,
+  "total_gz": 50399,
   "sent": [
     "a (emscripten_resize_heap)",
     "b (_setitimer_js)",
diff --git a/test/codesize/test_codesize_hello_dylink.json b/test/codesize/test_codesize_hello_dylink.json
index 52d828e202dce..87eebf0178f2c 100644
--- a/test/codesize/test_codesize_hello_dylink.json
+++ b/test/codesize/test_codesize_hello_dylink.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 26712,
   "a.out.js.gz": 11400,
-  "a.out.nodebug.wasm": 17757,
-  "a.out.nodebug.wasm.gz": 8972,
-  "total": 44469,
-  "total_gz": 20372,
+  "a.out.nodebug.wasm": 17751,
+  "a.out.nodebug.wasm.gz": 8984,
+  "total": 44463,
+  "total_gz": 20384,
   "sent": [
     "__syscall_stat64",
     "emscripten_resize_heap",
diff --git a/test/codesize/test_codesize_hello_dylink_all.json b/test/codesize/test_codesize_hello_dylink_all.json
index 7068e4a877c50..139779b4e2dfc 100644
--- a/test/codesize/test_codesize_hello_dylink_all.json
+++ b/test/codesize/test_codesize_hello_dylink_all.json
@@ -1,7 +1,7 @@
 {
   "a.out.js": 245720,
-  "a.out.nodebug.wasm": 574286,
-  "total": 820006,
+  "a.out.nodebug.wasm": 574007,
+  "total": 819727,
   "sent": [
     "IMG_Init",
     "IMG_Load",
diff --git a/test/codesize/test_codesize_mem_O3_standalone_narg_flto.json b/test/codesize/test_codesize_mem_O3_standalone_narg_flto.json
index 322ae921f0b30..913e963329b60 100644
--- a/test/codesize/test_codesize_mem_O3_standalone_narg_flto.json
+++ b/test/codesize/test_codesize_mem_O3_standalone_narg_flto.json
@@ -1,10 +1,10 @@
 {
   "a.out.js": 3570,
   "a.out.js.gz": 1701,
-  "a.out.nodebug.wasm": 4077,
-  "a.out.nodebug.wasm.gz": 2031,
-  "total": 7647,
-  "total_gz": 3732,
+  "a.out.nodebug.wasm": 4079,
+  "a.out.nodebug.wasm.gz": 2025,
+  "total": 7649,
+  "total_gz": 3726,
   "sent": [
     "proc_exit"
   ],