From 13989d9af42e3175b82837cfae57b40165aaa6db Mon Sep 17 00:00:00 2001
From: idranme <96647698+idranme@users.noreply.github.com>
Date: Wed, 25 Sep 2024 09:36:54 +0000
Subject: [PATCH 1/3] Compatible with Elecrton renderer process

---
 src/proxyClient.js   | 2 +-
 src/shell.js         | 2 +-
 src/shell_minimal.js | 2 +-
 src/wasm_worker.js   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/proxyClient.js b/src/proxyClient.js
index f624fa3976148..d04b411b18d50 100644
--- a/src/proxyClient.js
+++ b/src/proxyClient.js
@@ -16,7 +16,7 @@
 #endif
 
 #if ENVIRONMENT_MAY_BE_NODE
-var ENVIRONMENT_IS_NODE = typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string';
+var ENVIRONMENT_IS_NODE = typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string' && process.type != 'renderer';
 if (ENVIRONMENT_IS_NODE) {
   var NodeWorker = require('worker_threads').Worker;
   global.Worker = function(url, options) {
diff --git a/src/shell.js b/src/shell.js
index 0e44d5625a5bc..104ceb4ce9b1b 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -96,7 +96,7 @@ var ENVIRONMENT_IS_WEB = typeof window == 'object';
 var ENVIRONMENT_IS_WORKER = typeof importScripts == 'function';
 // N.b. Electron.js environment is simultaneously a NODE-environment, but
 // also a web environment.
-var ENVIRONMENT_IS_NODE = typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string';
+var ENVIRONMENT_IS_NODE = typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string' && process.type != 'renderer';
 #if AUDIO_WORKLET
 var ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER && !ENVIRONMENT_IS_AUDIO_WORKLET;
 #else
diff --git a/src/shell_minimal.js b/src/shell_minimal.js
index 6c2167fd2f312..7567843242bf3 100644
--- a/src/shell_minimal.js
+++ b/src/shell_minimal.js
@@ -46,7 +46,7 @@ var readyPromise = new Promise((resolve, reject) => {
 #endif
 
 #if ENVIRONMENT_MAY_BE_NODE
-var ENVIRONMENT_IS_NODE = typeof process == 'object';
+var ENVIRONMENT_IS_NODE = typeof process == 'object' && process.type != 'renderer';
 #endif
 
 #if ENVIRONMENT_MAY_BE_SHELL
diff --git a/src/wasm_worker.js b/src/wasm_worker.js
index 787b53094bdb6..914d8151ebbf9 100644
--- a/src/wasm_worker.js
+++ b/src/wasm_worker.js
@@ -6,7 +6,7 @@
 
 #if ENVIRONMENT_MAY_BE_NODE
 // Node.js support
-var ENVIRONMENT_IS_NODE = typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string';
+var ENVIRONMENT_IS_NODE = typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string' && process.type != 'renderer';
 if (ENVIRONMENT_IS_NODE) {
   // Create as web-worker-like an environment as we can.
 

From c95975f0328ba9b0875935c79c8d9f5880bd7560 Mon Sep 17 00:00:00 2001
From: idranme <idranme@outlook.com>
Date: Thu, 26 Sep 2024 04:48:25 +0800
Subject: [PATCH 2/3] Rebaseline codesize expectations

---
 test/code_size/embind_hello_wasm.json                     | 4 ++--
 test/code_size/embind_val_wasm.json                       | 8 ++++----
 test/code_size/hello_webgl2_wasm.json                     | 8 ++++----
 test/code_size/hello_webgl2_wasm2js.json                  | 8 ++++----
 test/code_size/hello_webgl_wasm.json                      | 8 ++++----
 test/code_size/hello_webgl_wasm2js.json                   | 8 ++++----
 test/code_size/math_wasm.json                             | 4 ++--
 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_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.gzsize       | 2 +-
 test/other/codesize/test_codesize_cxx_wasmfs.jssize       | 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.gzsize     | 2 +-
 test/other/codesize/test_codesize_files_wasmfs.jssize     | 2 +-
 test/other/codesize/test_codesize_files_wasmfs.size       | 2 +-
 test/other/codesize/test_codesize_hello_O0.gzsize         | 2 +-
 test/other/codesize/test_codesize_hello_O0.jssize         | 2 +-
 test/other/codesize/test_codesize_hello_O0.size           | 2 +-
 test/other/codesize/test_codesize_hello_O1.gzsize         | 2 +-
 test/other/codesize/test_codesize_hello_O1.jssize         | 2 +-
 test/other/codesize/test_codesize_hello_O1.size           | 2 +-
 test/other/codesize/test_codesize_hello_O2.gzsize         | 2 +-
 test/other/codesize/test_codesize_hello_O2.jssize         | 2 +-
 test/other/codesize/test_codesize_hello_O2.size           | 2 +-
 test/other/codesize/test_codesize_hello_O3.gzsize         | 2 +-
 test/other/codesize/test_codesize_hello_O3.jssize         | 2 +-
 test/other/codesize/test_codesize_hello_O3.size           | 2 +-
 test/other/codesize/test_codesize_hello_Os.gzsize         | 2 +-
 test/other/codesize/test_codesize_hello_Os.jssize         | 2 +-
 test/other/codesize/test_codesize_hello_Os.size           | 2 +-
 test/other/codesize/test_codesize_hello_Oz.gzsize         | 2 +-
 test/other/codesize/test_codesize_hello_Oz.jssize         | 2 +-
 test/other/codesize/test_codesize_hello_dylink.gzsize     | 2 +-
 test/other/codesize/test_codesize_hello_dylink.jssize     | 2 +-
 .../codesize/test_codesize_hello_export_nothing.gzsize    | 2 +-
 .../codesize/test_codesize_hello_export_nothing.jssize    | 2 +-
 test/other/codesize/test_codesize_hello_wasmfs.gzsize     | 2 +-
 test/other/codesize/test_codesize_hello_wasmfs.jssize     | 2 +-
 test/other/codesize/test_codesize_hello_wasmfs.size       | 2 +-
 .../codesize/test_codesize_libcxxabi_message_O3.gzsize    | 2 +-
 .../codesize/test_codesize_libcxxabi_message_O3.jssize    | 2 +-
 .../test_codesize_libcxxabi_message_O3_standalone.gzsize  | 2 +-
 .../test_codesize_libcxxabi_message_O3_standalone.jssize  | 2 +-
 test/other/codesize/test_codesize_mem_O3.gzsize           | 2 +-
 test/other/codesize/test_codesize_mem_O3.jssize           | 2 +-
 test/other/codesize/test_codesize_mem_O3_grow.gzsize      | 2 +-
 test/other/codesize/test_codesize_mem_O3_grow.jssize      | 2 +-
 .../codesize/test_codesize_mem_O3_grow_standalone.gzsize  | 2 +-
 .../codesize/test_codesize_mem_O3_grow_standalone.jssize  | 2 +-
 .../other/codesize/test_codesize_mem_O3_standalone.gzsize | 2 +-
 .../other/codesize/test_codesize_mem_O3_standalone.jssize | 2 +-
 .../codesize/test_codesize_mem_O3_standalone_lib.gzsize   | 2 +-
 .../codesize/test_codesize_mem_O3_standalone_lib.jssize   | 2 +-
 .../codesize/test_codesize_mem_O3_standalone_narg.gzsize  | 2 +-
 .../codesize/test_codesize_mem_O3_standalone_narg.jssize  | 2 +-
 .../test_codesize_mem_O3_standalone_narg_flto.gzsize      | 2 +-
 .../test_codesize_mem_O3_standalone_narg_flto.jssize      | 2 +-
 test/other/codesize/test_codesize_minimal_64.gzsize       | 2 +-
 test/other/codesize/test_codesize_minimal_64.jssize       | 2 +-
 test/other/codesize/test_codesize_minimal_O0.gzsize       | 2 +-
 test/other/codesize/test_codesize_minimal_O0.jssize       | 2 +-
 test/other/codesize/test_codesize_minimal_O1.gzsize       | 2 +-
 test/other/codesize/test_codesize_minimal_O1.jssize       | 2 +-
 test/other/codesize/test_codesize_minimal_O2.gzsize       | 2 +-
 test/other/codesize/test_codesize_minimal_O2.jssize       | 2 +-
 test/other/codesize/test_codesize_minimal_O3.gzsize       | 2 +-
 test/other/codesize/test_codesize_minimal_O3.jssize       | 2 +-
 test/other/codesize/test_codesize_minimal_Os.gzsize       | 2 +-
 test/other/codesize/test_codesize_minimal_Os.jssize       | 2 +-
 test/other/codesize/test_codesize_minimal_Os_mr.gzsize    | 2 +-
 test/other/codesize/test_codesize_minimal_Os_mr.jssize    | 2 +-
 test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize | 2 +-
 test/other/codesize/test_codesize_minimal_Oz-ctors.jssize | 2 +-
 test/other/codesize/test_codesize_minimal_Oz.gzsize       | 2 +-
 test/other/codesize/test_codesize_minimal_Oz.jssize       | 2 +-
 test/other/codesize/test_codesize_minimal_pthreads.gzsize | 2 +-
 test/other/codesize/test_codesize_minimal_pthreads.jssize | 2 +-
 test/other/codesize/test_codesize_minimal_wasmfs.gzsize   | 2 +-
 test/other/codesize/test_codesize_minimal_wasmfs.jssize   | 2 +-
 test/other/test_unoptimized_code_size.js.size             | 2 +-
 test/other/test_unoptimized_code_size.wasm.size           | 2 +-
 test/other/test_unoptimized_code_size_no_asserts.js.size  | 2 +-
 .../other/test_unoptimized_code_size_no_asserts.wasm.size | 2 +-
 test/other/test_unoptimized_code_size_strict.js.size      | 2 +-
 test/other/test_unoptimized_code_size_strict.wasm.size    | 2 +-
 110 files changed, 133 insertions(+), 133 deletions(-)

diff --git a/test/code_size/embind_hello_wasm.json b/test/code_size/embind_hello_wasm.json
index 6312d6f4477b0..9949abe5a670b 100644
--- a/test/code_size/embind_hello_wasm.json
+++ b/test/code_size/embind_hello_wasm.json
@@ -4,7 +4,7 @@
   "a.js": 9727,
   "a.js.gz": 4295,
   "a.wasm": 7728,
-  "a.wasm.gz": 3519,
+  "a.wasm.gz": 3515,
   "total": 18007,
-  "total_gz": 8194
+  "total_gz": 8190
 }
diff --git a/test/code_size/embind_val_wasm.json b/test/code_size/embind_val_wasm.json
index 50ca83fd15d93..0aa31c02c3739 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": 9563,
-  "a.wasm.gz": 4919,
-  "total": 16964,
-  "total_gz": 8246
+  "a.wasm": 9558,
+  "a.wasm.gz": 4908,
+  "total": 16959,
+  "total_gz": 8235
 }
diff --git a/test/code_size/hello_webgl2_wasm.json b/test/code_size/hello_webgl2_wasm.json
index 02421c94f9c0f..a54d1785b3178 100644
--- a/test/code_size/hello_webgl2_wasm.json
+++ b/test/code_size/hello_webgl2_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 328,
   "a.js": 4531,
   "a.js.gz": 2312,
-  "a.wasm": 10400,
-  "a.wasm.gz": 6694,
-  "total": 15385,
-  "total_gz": 9334
+  "a.wasm": 10402,
+  "a.wasm.gz": 6699,
+  "total": 15387,
+  "total_gz": 9339
 }
diff --git a/test/code_size/hello_webgl2_wasm2js.json b/test/code_size/hello_webgl2_wasm2js.json
index 9b45b773d35f1..c25ae0e284da7 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": 22202,
-  "a.js.gz": 11587,
-  "total": 22548,
-  "total_gz": 11849
+  "a.js": 22204,
+  "a.js.gz": 11596,
+  "total": 22550,
+  "total_gz": 11858
 }
diff --git a/test/code_size/hello_webgl_wasm.json b/test/code_size/hello_webgl_wasm.json
index f4c5980862072..a3938096fb557 100644
--- a/test/code_size/hello_webgl_wasm.json
+++ b/test/code_size/hello_webgl_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 328,
   "a.js": 4069,
   "a.js.gz": 2158,
-  "a.wasm": 10400,
-  "a.wasm.gz": 6694,
-  "total": 14923,
-  "total_gz": 9180
+  "a.wasm": 10402,
+  "a.wasm.gz": 6699,
+  "total": 14925,
+  "total_gz": 9185
 }
diff --git a/test/code_size/hello_webgl_wasm2js.json b/test/code_size/hello_webgl_wasm2js.json
index 071d44c6d5131..3e8754513a95c 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": 21728,
-  "a.js.gz": 11418,
-  "total": 22074,
-  "total_gz": 11680
+  "a.js": 21730,
+  "a.js.gz": 11428,
+  "total": 22076,
+  "total_gz": 11690
 }
diff --git a/test/code_size/math_wasm.json b/test/code_size/math_wasm.json
index 391e9180af9a3..5328e0087d307 100644
--- a/test/code_size/math_wasm.json
+++ b/test/code_size/math_wasm.json
@@ -4,7 +4,7 @@
   "a.js": 110,
   "a.js.gz": 125,
   "a.wasm": 2719,
-  "a.wasm.gz": 1675,
+  "a.wasm.gz": 1673,
   "total": 3381,
-  "total_gz": 2180
+  "total_gz": 2178
 }
diff --git a/test/code_size/random_printf_wasm.json b/test/code_size/random_printf_wasm.json
index 7a055e7fd1fcd..bcfa0afce45db 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": 6859,
-  "total": 12694,
-  "total_gz": 6859
+  "a.html": 12690,
+  "a.html.gz": 6857,
+  "total": 12690,
+  "total_gz": 6857
 }
diff --git a/test/code_size/random_printf_wasm2js.json b/test/code_size/random_printf_wasm2js.json
index 0412ccf8bf4f4..f80e7681628fe 100644
--- a/test/code_size/random_printf_wasm2js.json
+++ b/test/code_size/random_printf_wasm2js.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 17280,
-  "a.html.gz": 7490,
-  "total": 17280,
-  "total_gz": 7490
+  "a.html": 17325,
+  "a.html.gz": 7507,
+  "total": 17325,
+  "total_gz": 7507
 }
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.gzsize b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
index 732e60fbfb752..6ed96170748c2 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
@@ -1 +1 @@
-8451
+8466
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.jssize b/test/other/codesize/test_codesize_cxx_ctors1.jssize
index 5260d2d5018d0..c2f6070ae60d3 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.jssize
@@ -1 +1 @@
-20829
+20855
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.size b/test/other/codesize/test_codesize_cxx_ctors1.size
index 45fc5ebbc180f..8dbf82db4bd53 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.size
+++ b/test/other/codesize/test_codesize_cxx_ctors1.size
@@ -1 +1 @@
-129291
+129325
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.gzsize b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
index 78755de989f5f..70461f8a6e739 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
@@ -1 +1 @@
-8435
+8450
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.jssize b/test/other/codesize/test_codesize_cxx_ctors2.jssize
index cfe33a90d39b5..2479bdd84e3b1 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.jssize
@@ -1 +1 @@
-20797
+20823
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.size b/test/other/codesize/test_codesize_cxx_ctors2.size
index 1927b8824f928..0a6eb06696eb3 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.size
+++ b/test/other/codesize/test_codesize_cxx_ctors2.size
@@ -1 +1 @@
-128737
+128771
diff --git a/test/other/codesize/test_codesize_cxx_except.gzsize b/test/other/codesize/test_codesize_cxx_except.gzsize
index 99536fa65b60a..22e75887797fe 100644
--- a/test/other/codesize/test_codesize_cxx_except.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except.gzsize
@@ -1 +1 @@
-9473
+9488
diff --git a/test/other/codesize/test_codesize_cxx_except.jssize b/test/other/codesize/test_codesize_cxx_except.jssize
index 1b05bd5ff1efb..4024e9f7afaa1 100644
--- a/test/other/codesize/test_codesize_cxx_except.jssize
+++ b/test/other/codesize/test_codesize_cxx_except.jssize
@@ -1 +1 @@
-24673
+24699
diff --git a/test/other/codesize/test_codesize_cxx_except.size b/test/other/codesize/test_codesize_cxx_except.size
index 446ac3dafd7be..b0ac542da834c 100644
--- a/test/other/codesize/test_codesize_cxx_except.size
+++ b/test/other/codesize/test_codesize_cxx_except.size
@@ -1 +1 @@
-171404
+171408
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
index e99025888b261..ae5b164f00e09 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
@@ -1 +1 @@
-8411
+8426
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.jssize b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
index 5581ba83d8e7c..f57caa3310625 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
@@ -1 +1 @@
-20723
+20749
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.size b/test/other/codesize/test_codesize_cxx_except_wasm.size
index 6277a66a91a74..83b37d84fd0a9 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.size
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.size
@@ -1 +1 @@
-142507
+142532
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 e99025888b261..ae5b164f00e09 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 @@
-8411
+8426
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 5581ba83d8e7c..f57caa3310625 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 @@
-20723
+20749
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 6e9dd126cc358..8a9f04851cd11 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 @@
-145144
+145169
diff --git a/test/other/codesize/test_codesize_cxx_lto.gzsize b/test/other/codesize/test_codesize_cxx_lto.gzsize
index c2f4c1d61ce2b..b57252391c66a 100644
--- a/test/other/codesize/test_codesize_cxx_lto.gzsize
+++ b/test/other/codesize/test_codesize_cxx_lto.gzsize
@@ -1 +1 @@
-8342
+8357
diff --git a/test/other/codesize/test_codesize_cxx_lto.jssize b/test/other/codesize/test_codesize_cxx_lto.jssize
index e54ddb11fa2c6..0a0378c50fc34 100644
--- a/test/other/codesize/test_codesize_cxx_lto.jssize
+++ b/test/other/codesize/test_codesize_cxx_lto.jssize
@@ -1 +1 @@
-20407
+20433
diff --git a/test/other/codesize/test_codesize_cxx_mangle.gzsize b/test/other/codesize/test_codesize_cxx_mangle.gzsize
index ca948475b09c8..959f89db8c82c 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.gzsize
+++ b/test/other/codesize/test_codesize_cxx_mangle.gzsize
@@ -1 +1 @@
-9475
+9490
diff --git a/test/other/codesize/test_codesize_cxx_mangle.jssize b/test/other/codesize/test_codesize_cxx_mangle.jssize
index 1b05bd5ff1efb..4024e9f7afaa1 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.jssize
+++ b/test/other/codesize/test_codesize_cxx_mangle.jssize
@@ -1 +1 @@
-24673
+24699
diff --git a/test/other/codesize/test_codesize_cxx_mangle.size b/test/other/codesize/test_codesize_cxx_mangle.size
index d18c01e7bc4bb..f7415471dcb89 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.size
+++ b/test/other/codesize/test_codesize_cxx_mangle.size
@@ -1 +1 @@
-232924
+232928
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.gzsize b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
index 732e60fbfb752..6ed96170748c2 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.gzsize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
@@ -1 +1 @@
-8451
+8466
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.jssize b/test/other/codesize/test_codesize_cxx_noexcept.jssize
index 5260d2d5018d0..c2f6070ae60d3 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.jssize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.jssize
@@ -1 +1 @@
-20829
+20855
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.size b/test/other/codesize/test_codesize_cxx_noexcept.size
index bb292bbe843df..050fa02e0c7f9 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.size
+++ b/test/other/codesize/test_codesize_cxx_noexcept.size
@@ -1 +1 @@
-132097
+132131
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.gzsize b/test/other/codesize/test_codesize_cxx_wasmfs.gzsize
index 65fdaa483a770..46f8bb1772dcd 100644
--- a/test/other/codesize/test_codesize_cxx_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_cxx_wasmfs.gzsize
@@ -1 +1 @@
-3884
+3896
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.jssize b/test/other/codesize/test_codesize_cxx_wasmfs.jssize
index 4a972457c2e4a..a0debf9827b16 100644
--- a/test/other/codesize/test_codesize_cxx_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_cxx_wasmfs.jssize
@@ -1 +1 @@
-8664
+8690
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.size b/test/other/codesize/test_codesize_cxx_wasmfs.size
index 4b74724677f0a..26f6ca42f7d6a 100644
--- a/test/other/codesize/test_codesize_cxx_wasmfs.size
+++ b/test/other/codesize/test_codesize_cxx_wasmfs.size
@@ -1 +1 @@
-169392
+169426
diff --git a/test/other/codesize/test_codesize_files_js_fs.gzsize b/test/other/codesize/test_codesize_files_js_fs.gzsize
index 594e0a236d3a5..e291852988cfa 100644
--- a/test/other/codesize/test_codesize_files_js_fs.gzsize
+++ b/test/other/codesize/test_codesize_files_js_fs.gzsize
@@ -1 +1 @@
-7584
+7599
diff --git a/test/other/codesize/test_codesize_files_js_fs.jssize b/test/other/codesize/test_codesize_files_js_fs.jssize
index 9b005d8536b07..b87d236c90b2f 100644
--- a/test/other/codesize/test_codesize_files_js_fs.jssize
+++ b/test/other/codesize/test_codesize_files_js_fs.jssize
@@ -1 +1 @@
-18730
+18756
diff --git a/test/other/codesize/test_codesize_files_wasmfs.gzsize b/test/other/codesize/test_codesize_files_wasmfs.gzsize
index ec21808e298ac..cf901d13bd56d 100644
--- a/test/other/codesize/test_codesize_files_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_files_wasmfs.gzsize
@@ -1 +1 @@
-2966
+2979
diff --git a/test/other/codesize/test_codesize_files_wasmfs.jssize b/test/other/codesize/test_codesize_files_wasmfs.jssize
index 7e4a43f0d0087..f8a3551b3f10a 100644
--- a/test/other/codesize/test_codesize_files_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_files_wasmfs.jssize
@@ -1 +1 @@
-6300
+6326
diff --git a/test/other/codesize/test_codesize_files_wasmfs.size b/test/other/codesize/test_codesize_files_wasmfs.size
index 77cfa8084867e..b493e90627b7c 100644
--- a/test/other/codesize/test_codesize_files_wasmfs.size
+++ b/test/other/codesize/test_codesize_files_wasmfs.size
@@ -1 +1 @@
-50984
+50982
diff --git a/test/other/codesize/test_codesize_hello_O0.gzsize b/test/other/codesize/test_codesize_hello_O0.gzsize
index a00c8d8503f05..8ca7d7e2dcf2a 100644
--- a/test/other/codesize/test_codesize_hello_O0.gzsize
+++ b/test/other/codesize/test_codesize_hello_O0.gzsize
@@ -1 +1 @@
-7991
+8003
diff --git a/test/other/codesize/test_codesize_hello_O0.jssize b/test/other/codesize/test_codesize_hello_O0.jssize
index 325879017161c..643a0f287c9e7 100644
--- a/test/other/codesize/test_codesize_hello_O0.jssize
+++ b/test/other/codesize/test_codesize_hello_O0.jssize
@@ -1 +1 @@
-21372
+21402
diff --git a/test/other/codesize/test_codesize_hello_O0.size b/test/other/codesize/test_codesize_hello_O0.size
index 28da763855e67..507ba42c86fa0 100644
--- a/test/other/codesize/test_codesize_hello_O0.size
+++ b/test/other/codesize/test_codesize_hello_O0.size
@@ -1 +1 @@
-14457
+14452
diff --git a/test/other/codesize/test_codesize_hello_O1.gzsize b/test/other/codesize/test_codesize_hello_O1.gzsize
index 3e8aec5254218..ae1819006d824 100644
--- a/test/other/codesize/test_codesize_hello_O1.gzsize
+++ b/test/other/codesize/test_codesize_hello_O1.gzsize
@@ -1 +1 @@
-2790
+2802
diff --git a/test/other/codesize/test_codesize_hello_O1.jssize b/test/other/codesize/test_codesize_hello_O1.jssize
index baf6c82fe582a..33a7f82d7a3fe 100644
--- a/test/other/codesize/test_codesize_hello_O1.jssize
+++ b/test/other/codesize/test_codesize_hello_O1.jssize
@@ -1 +1 @@
-6976
+7006
diff --git a/test/other/codesize/test_codesize_hello_O1.size b/test/other/codesize/test_codesize_hello_O1.size
index 1db299c003761..5072a438edffb 100644
--- a/test/other/codesize/test_codesize_hello_O1.size
+++ b/test/other/codesize/test_codesize_hello_O1.size
@@ -1 +1 @@
-2460
+2447
diff --git a/test/other/codesize/test_codesize_hello_O2.gzsize b/test/other/codesize/test_codesize_hello_O2.gzsize
index 636cf9ce0a780..ee84bf608255e 100644
--- a/test/other/codesize/test_codesize_hello_O2.gzsize
+++ b/test/other/codesize/test_codesize_hello_O2.gzsize
@@ -1 +1 @@
-2469
+2480
diff --git a/test/other/codesize/test_codesize_hello_O2.jssize b/test/other/codesize/test_codesize_hello_O2.jssize
index e9c02dad1826a..cc85015f9fe37 100644
--- a/test/other/codesize/test_codesize_hello_O2.jssize
+++ b/test/other/codesize/test_codesize_hello_O2.jssize
@@ -1 +1 @@
-5000
+5026
diff --git a/test/other/codesize/test_codesize_hello_O2.size b/test/other/codesize/test_codesize_hello_O2.size
index b6ac305674cf9..db0e38b0ee135 100644
--- a/test/other/codesize/test_codesize_hello_O2.size
+++ b/test/other/codesize/test_codesize_hello_O2.size
@@ -1 +1 @@
-2047
+2045
diff --git a/test/other/codesize/test_codesize_hello_O3.gzsize b/test/other/codesize/test_codesize_hello_O3.gzsize
index edcb6c1945d2c..a0198be084430 100644
--- a/test/other/codesize/test_codesize_hello_O3.gzsize
+++ b/test/other/codesize/test_codesize_hello_O3.gzsize
@@ -1 +1 @@
-2387
+2400
diff --git a/test/other/codesize/test_codesize_hello_O3.jssize b/test/other/codesize/test_codesize_hello_O3.jssize
index ac36d9074111e..6cd4c5d47fe76 100644
--- a/test/other/codesize/test_codesize_hello_O3.jssize
+++ b/test/other/codesize/test_codesize_hello_O3.jssize
@@ -1 +1 @@
-4846
+4872
diff --git a/test/other/codesize/test_codesize_hello_O3.size b/test/other/codesize/test_codesize_hello_O3.size
index 173a6680f8970..b0539e90d9ac1 100644
--- a/test/other/codesize/test_codesize_hello_O3.size
+++ b/test/other/codesize/test_codesize_hello_O3.size
@@ -1 +1 @@
-1737
+1735
diff --git a/test/other/codesize/test_codesize_hello_Os.gzsize b/test/other/codesize/test_codesize_hello_Os.gzsize
index edcb6c1945d2c..a0198be084430 100644
--- a/test/other/codesize/test_codesize_hello_Os.gzsize
+++ b/test/other/codesize/test_codesize_hello_Os.gzsize
@@ -1 +1 @@
-2387
+2400
diff --git a/test/other/codesize/test_codesize_hello_Os.jssize b/test/other/codesize/test_codesize_hello_Os.jssize
index ac36d9074111e..6cd4c5d47fe76 100644
--- a/test/other/codesize/test_codesize_hello_Os.jssize
+++ b/test/other/codesize/test_codesize_hello_Os.jssize
@@ -1 +1 @@
-4846
+4872
diff --git a/test/other/codesize/test_codesize_hello_Os.size b/test/other/codesize/test_codesize_hello_Os.size
index 54c9fc81b32d0..921f45ad4bffa 100644
--- a/test/other/codesize/test_codesize_hello_Os.size
+++ b/test/other/codesize/test_codesize_hello_Os.size
@@ -1 +1 @@
-1728
+1726
diff --git a/test/other/codesize/test_codesize_hello_Oz.gzsize b/test/other/codesize/test_codesize_hello_Oz.gzsize
index 9b65630a860d2..cb787bcddc1a1 100644
--- a/test/other/codesize/test_codesize_hello_Oz.gzsize
+++ b/test/other/codesize/test_codesize_hello_Oz.gzsize
@@ -1 +1 @@
-2367
+2377
diff --git a/test/other/codesize/test_codesize_hello_Oz.jssize b/test/other/codesize/test_codesize_hello_Oz.jssize
index eab2ff3ab7202..5d5e2123b8980 100644
--- a/test/other/codesize/test_codesize_hello_Oz.jssize
+++ b/test/other/codesize/test_codesize_hello_Oz.jssize
@@ -1 +1 @@
-4813
+4839
diff --git a/test/other/codesize/test_codesize_hello_dylink.gzsize b/test/other/codesize/test_codesize_hello_dylink.gzsize
index b7f6d0eb72bf1..1862acef29284 100644
--- a/test/other/codesize/test_codesize_hello_dylink.gzsize
+++ b/test/other/codesize/test_codesize_hello_dylink.gzsize
@@ -1 +1 @@
-6307
+6319
diff --git a/test/other/codesize/test_codesize_hello_dylink.jssize b/test/other/codesize/test_codesize_hello_dylink.jssize
index f238adcd67c26..e4da9ae2b87df 100644
--- a/test/other/codesize/test_codesize_hello_dylink.jssize
+++ b/test/other/codesize/test_codesize_hello_dylink.jssize
@@ -1 +1 @@
-13896
+13922
diff --git a/test/other/codesize/test_codesize_hello_export_nothing.gzsize b/test/other/codesize/test_codesize_hello_export_nothing.gzsize
index 548f0a55a5dd1..c102fe8faa1e0 100644
--- a/test/other/codesize/test_codesize_hello_export_nothing.gzsize
+++ b/test/other/codesize/test_codesize_hello_export_nothing.gzsize
@@ -1 +1 @@
-1744
+1756
diff --git a/test/other/codesize/test_codesize_hello_export_nothing.jssize b/test/other/codesize/test_codesize_hello_export_nothing.jssize
index 496991636dc10..4fd6dcaab8ea4 100644
--- a/test/other/codesize/test_codesize_hello_export_nothing.jssize
+++ b/test/other/codesize/test_codesize_hello_export_nothing.jssize
@@ -1 +1 @@
-3702
+3728
diff --git a/test/other/codesize/test_codesize_hello_wasmfs.gzsize b/test/other/codesize/test_codesize_hello_wasmfs.gzsize
index edcb6c1945d2c..a0198be084430 100644
--- a/test/other/codesize/test_codesize_hello_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_hello_wasmfs.gzsize
@@ -1 +1 @@
-2387
+2400
diff --git a/test/other/codesize/test_codesize_hello_wasmfs.jssize b/test/other/codesize/test_codesize_hello_wasmfs.jssize
index ac36d9074111e..6cd4c5d47fe76 100644
--- a/test/other/codesize/test_codesize_hello_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_hello_wasmfs.jssize
@@ -1 +1 @@
-4846
+4872
diff --git a/test/other/codesize/test_codesize_hello_wasmfs.size b/test/other/codesize/test_codesize_hello_wasmfs.size
index 173a6680f8970..b0539e90d9ac1 100644
--- a/test/other/codesize/test_codesize_hello_wasmfs.size
+++ b/test/other/codesize/test_codesize_hello_wasmfs.size
@@ -1 +1 @@
-1737
+1735
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize b/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize
index da2d8a61ec094..291e0b2304bc9 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize
@@ -1 +1 @@
-1943
+1954
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize b/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize
index 8a3323ae758bd..d7df15d1cdfb2 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize
@@ -1 +1 @@
-4074
+4100
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize
index 90e525730040d..a49a11562aa7d 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize
@@ -1 +1 @@
-1977
+1989
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize
index 6ddb3af78151f..d3a0a43cd148a 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize
@@ -1 +1 @@
-4121
+4147
diff --git a/test/other/codesize/test_codesize_mem_O3.gzsize b/test/other/codesize/test_codesize_mem_O3.gzsize
index 075c4f664bbc1..4816e15b2f9bf 100644
--- a/test/other/codesize/test_codesize_mem_O3.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3.gzsize
@@ -1 +1 @@
-2405
+2417
diff --git a/test/other/codesize/test_codesize_mem_O3.jssize b/test/other/codesize/test_codesize_mem_O3.jssize
index 059b3b87fb1ae..6abf46875e0bd 100644
--- a/test/other/codesize/test_codesize_mem_O3.jssize
+++ b/test/other/codesize/test_codesize_mem_O3.jssize
@@ -1 +1 @@
-4988
+5014
diff --git a/test/other/codesize/test_codesize_mem_O3_grow.gzsize b/test/other/codesize/test_codesize_mem_O3_grow.gzsize
index efbf27c074661..aed4b56065d98 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_grow.gzsize
@@ -1 +1 @@
-2547
+2558
diff --git a/test/other/codesize/test_codesize_mem_O3_grow.jssize b/test/other/codesize/test_codesize_mem_O3_grow.jssize
index 212d93183ba59..5de804a0900c1 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_grow.jssize
@@ -1 +1 @@
-5268
+5294
diff --git a/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize b/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize
index 82a96596df1ff..2d9441aa7e4f0 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize
@@ -1 +1 @@
-2249
+2261
diff --git a/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize b/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize
index 3b96eed2825be..6e8b58d80cc1b 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize
@@ -1 +1 @@
-4677
+4703
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone.gzsize
index 65ea5f0d30d84..0146e586cf2e8 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone.gzsize
@@ -1 +1 @@
-2214
+2226
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone.jssize b/test/other/codesize/test_codesize_mem_O3_standalone.jssize
index 425d3b02ea7cd..2e58f957f721f 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone.jssize
@@ -1 +1 @@
-4607
+4633
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize
index 85e44f57b2ad8..ede5ca4172efa 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize
@@ -1 +1 @@
-1964
+1975
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize b/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize
index af9bc346b7a89..cf4f87af62aed 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize
@@ -1 +1 @@
-4125
+4151
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize
index 90e525730040d..a49a11562aa7d 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize
@@ -1 +1 @@
-1977
+1989
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize b/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize
index 6ddb3af78151f..d3a0a43cd148a 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize
@@ -1 +1 @@
-4121
+4147
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize
index 90e525730040d..a49a11562aa7d 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize
@@ -1 +1 @@
-1977
+1989
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize
index 6ddb3af78151f..d3a0a43cd148a 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize
@@ -1 +1 @@
-4121
+4147
diff --git a/test/other/codesize/test_codesize_minimal_64.gzsize b/test/other/codesize/test_codesize_minimal_64.gzsize
index 1c631e1e4ce7e..6ad20cc130f59 100644
--- a/test/other/codesize/test_codesize_minimal_64.gzsize
+++ b/test/other/codesize/test_codesize_minimal_64.gzsize
@@ -1 +1 @@
-1568
+1581
diff --git a/test/other/codesize/test_codesize_minimal_64.jssize b/test/other/codesize/test_codesize_minimal_64.jssize
index 7c85d6598dbc2..3165478097644 100644
--- a/test/other/codesize/test_codesize_minimal_64.jssize
+++ b/test/other/codesize/test_codesize_minimal_64.jssize
@@ -1 +1 @@
-3266
+3292
diff --git a/test/other/codesize/test_codesize_minimal_O0.gzsize b/test/other/codesize/test_codesize_minimal_O0.gzsize
index 3152e4729360a..53bc518f1bad7 100644
--- a/test/other/codesize/test_codesize_minimal_O0.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O0.gzsize
@@ -1 +1 @@
-6542
+6556
diff --git a/test/other/codesize/test_codesize_minimal_O0.jssize b/test/other/codesize/test_codesize_minimal_O0.jssize
index 80da3e23d9bb1..b61c7160f6b4a 100644
--- a/test/other/codesize/test_codesize_minimal_O0.jssize
+++ b/test/other/codesize/test_codesize_minimal_O0.jssize
@@ -1 +1 @@
-17522
+17552
diff --git a/test/other/codesize/test_codesize_minimal_O1.gzsize b/test/other/codesize/test_codesize_minimal_O1.gzsize
index 59a0a5c6a786c..7b222bc4f8a3b 100644
--- a/test/other/codesize/test_codesize_minimal_O1.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O1.gzsize
@@ -1 +1 @@
-1580
+1593
diff --git a/test/other/codesize/test_codesize_minimal_O1.jssize b/test/other/codesize/test_codesize_minimal_O1.jssize
index 4931f2482ab6b..7152990767668 100644
--- a/test/other/codesize/test_codesize_minimal_O1.jssize
+++ b/test/other/codesize/test_codesize_minimal_O1.jssize
@@ -1 +1 @@
-3691
+3721
diff --git a/test/other/codesize/test_codesize_minimal_O2.gzsize b/test/other/codesize/test_codesize_minimal_O2.gzsize
index ede42cd0f3220..a3cd1167acf5c 100644
--- a/test/other/codesize/test_codesize_minimal_O2.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O2.gzsize
@@ -1 +1 @@
-1436
+1448
diff --git a/test/other/codesize/test_codesize_minimal_O2.jssize b/test/other/codesize/test_codesize_minimal_O2.jssize
index 61dd0dc21f019..8a906e8958c65 100644
--- a/test/other/codesize/test_codesize_minimal_O2.jssize
+++ b/test/other/codesize/test_codesize_minimal_O2.jssize
@@ -1 +1 @@
-2853
+2879
diff --git a/test/other/codesize/test_codesize_minimal_O3.gzsize b/test/other/codesize/test_codesize_minimal_O3.gzsize
index 8b22af46346d1..1ffb6f488fce8 100644
--- a/test/other/codesize/test_codesize_minimal_O3.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O3.gzsize
@@ -1 +1 @@
-1401
+1413
diff --git a/test/other/codesize/test_codesize_minimal_O3.jssize b/test/other/codesize/test_codesize_minimal_O3.jssize
index 4d86a0941c7cc..1e779f31c3179 100644
--- a/test/other/codesize/test_codesize_minimal_O3.jssize
+++ b/test/other/codesize/test_codesize_minimal_O3.jssize
@@ -1 +1 @@
-2803
+2829
diff --git a/test/other/codesize/test_codesize_minimal_Os.gzsize b/test/other/codesize/test_codesize_minimal_Os.gzsize
index 8b22af46346d1..1ffb6f488fce8 100644
--- a/test/other/codesize/test_codesize_minimal_Os.gzsize
+++ b/test/other/codesize/test_codesize_minimal_Os.gzsize
@@ -1 +1 @@
-1401
+1413
diff --git a/test/other/codesize/test_codesize_minimal_Os.jssize b/test/other/codesize/test_codesize_minimal_Os.jssize
index 4d86a0941c7cc..1e779f31c3179 100644
--- a/test/other/codesize/test_codesize_minimal_Os.jssize
+++ b/test/other/codesize/test_codesize_minimal_Os.jssize
@@ -1 +1 @@
-2803
+2829
diff --git a/test/other/codesize/test_codesize_minimal_Os_mr.gzsize b/test/other/codesize/test_codesize_minimal_Os_mr.gzsize
index c48f9e0452587..6d26270b57e67 100644
--- a/test/other/codesize/test_codesize_minimal_Os_mr.gzsize
+++ b/test/other/codesize/test_codesize_minimal_Os_mr.gzsize
@@ -1 +1 @@
-269
+283
diff --git a/test/other/codesize/test_codesize_minimal_Os_mr.jssize b/test/other/codesize/test_codesize_minimal_Os_mr.jssize
index ec8785ec99e51..ed4f162019058 100644
--- a/test/other/codesize/test_codesize_minimal_Os_mr.jssize
+++ b/test/other/codesize/test_codesize_minimal_Os_mr.jssize
@@ -1 +1 @@
-405
+431
diff --git a/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize b/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize
index f252370658e8f..ed45f450e2506 100644
--- a/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize
+++ b/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize
@@ -1 +1 @@
-1393
+1404
diff --git a/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize b/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize
index 621b7ce5342a6..681f6fefb05e3 100644
--- a/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize
+++ b/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize
@@ -1 +1 @@
-2788
+2814
diff --git a/test/other/codesize/test_codesize_minimal_Oz.gzsize b/test/other/codesize/test_codesize_minimal_Oz.gzsize
index 8b22af46346d1..1ffb6f488fce8 100644
--- a/test/other/codesize/test_codesize_minimal_Oz.gzsize
+++ b/test/other/codesize/test_codesize_minimal_Oz.gzsize
@@ -1 +1 @@
-1401
+1413
diff --git a/test/other/codesize/test_codesize_minimal_Oz.jssize b/test/other/codesize/test_codesize_minimal_Oz.jssize
index 4d86a0941c7cc..1e779f31c3179 100644
--- a/test/other/codesize/test_codesize_minimal_Oz.jssize
+++ b/test/other/codesize/test_codesize_minimal_Oz.jssize
@@ -1 +1 @@
-2803
+2829
diff --git a/test/other/codesize/test_codesize_minimal_pthreads.gzsize b/test/other/codesize/test_codesize_minimal_pthreads.gzsize
index 538bf8bc94115..3a34b58fb8072 100644
--- a/test/other/codesize/test_codesize_minimal_pthreads.gzsize
+++ b/test/other/codesize/test_codesize_minimal_pthreads.gzsize
@@ -1 +1 @@
-4913
+4926
diff --git a/test/other/codesize/test_codesize_minimal_pthreads.jssize b/test/other/codesize/test_codesize_minimal_pthreads.jssize
index 71538ce26cffd..f6219db0cff41 100644
--- a/test/other/codesize/test_codesize_minimal_pthreads.jssize
+++ b/test/other/codesize/test_codesize_minimal_pthreads.jssize
@@ -1 +1 @@
-10458
+10484
diff --git a/test/other/codesize/test_codesize_minimal_wasmfs.gzsize b/test/other/codesize/test_codesize_minimal_wasmfs.gzsize
index 8b22af46346d1..1ffb6f488fce8 100644
--- a/test/other/codesize/test_codesize_minimal_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_minimal_wasmfs.gzsize
@@ -1 +1 @@
-1401
+1413
diff --git a/test/other/codesize/test_codesize_minimal_wasmfs.jssize b/test/other/codesize/test_codesize_minimal_wasmfs.jssize
index 4d86a0941c7cc..1e779f31c3179 100644
--- a/test/other/codesize/test_codesize_minimal_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_minimal_wasmfs.jssize
@@ -1 +1 @@
-2803
+2829
diff --git a/test/other/test_unoptimized_code_size.js.size b/test/other/test_unoptimized_code_size.js.size
index ab171da5f9e62..971ca16d6a24d 100644
--- a/test/other/test_unoptimized_code_size.js.size
+++ b/test/other/test_unoptimized_code_size.js.size
@@ -1 +1 @@
-54741
+54771
diff --git a/test/other/test_unoptimized_code_size.wasm.size b/test/other/test_unoptimized_code_size.wasm.size
index 28da763855e67..507ba42c86fa0 100644
--- a/test/other/test_unoptimized_code_size.wasm.size
+++ b/test/other/test_unoptimized_code_size.wasm.size
@@ -1 +1 @@
-14457
+14452
diff --git a/test/other/test_unoptimized_code_size_no_asserts.js.size b/test/other/test_unoptimized_code_size_no_asserts.js.size
index 60cf0bb761aa8..6f88b6e54aec0 100644
--- a/test/other/test_unoptimized_code_size_no_asserts.js.size
+++ b/test/other/test_unoptimized_code_size_no_asserts.js.size
@@ -1 +1 @@
-30561
+30591
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 685cb30041c53..8d6661ddaf6c7 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 @@
-11650
+11642
diff --git a/test/other/test_unoptimized_code_size_strict.js.size b/test/other/test_unoptimized_code_size_strict.js.size
index 936cf6959b6c2..23bc2fe0cbf2d 100644
--- a/test/other/test_unoptimized_code_size_strict.js.size
+++ b/test/other/test_unoptimized_code_size_strict.js.size
@@ -1 +1 @@
-53606
+53636
diff --git a/test/other/test_unoptimized_code_size_strict.wasm.size b/test/other/test_unoptimized_code_size_strict.wasm.size
index 28da763855e67..507ba42c86fa0 100644
--- a/test/other/test_unoptimized_code_size_strict.wasm.size
+++ b/test/other/test_unoptimized_code_size_strict.wasm.size
@@ -1 +1 @@
-14457
+14452

From 9cae8562e8054b0c0d3cde70622efdd2449ae774 Mon Sep 17 00:00:00 2001
From: idranme <96647698+idranme@users.noreply.github.com>
Date: Wed, 25 Sep 2024 21:59:35 +0000
Subject: [PATCH 3/3] Rebaseline codesize expectations

---
 test/code_size/embind_hello_wasm.json                     | 4 ++--
 test/code_size/embind_val_wasm.json                       | 8 ++++----
 test/code_size/hello_webgl2_wasm.json                     | 8 ++++----
 test/code_size/hello_webgl2_wasm2js.json                  | 8 ++++----
 test/code_size/hello_webgl_wasm.json                      | 8 ++++----
 test/code_size/hello_webgl_wasm2js.json                   | 8 ++++----
 test/code_size/math_wasm.json                             | 4 ++--
 test/code_size/random_printf_wasm.json                    | 8 ++++----
 test/code_size/random_printf_wasm2js.json                 | 8 ++++----
 test/other/codesize/test_codesize_cxx_ctors1.size         | 2 +-
 test/other/codesize/test_codesize_cxx_ctors2.size         | 2 +-
 test/other/codesize/test_codesize_cxx_except.size         | 2 +-
 test/other/codesize/test_codesize_cxx_except_wasm.size    | 2 +-
 .../codesize/test_codesize_cxx_except_wasm_exnref.size    | 2 +-
 test/other/codesize/test_codesize_cxx_mangle.size         | 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_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_hello_O2.size           | 2 +-
 test/other/codesize/test_codesize_hello_O3.size           | 2 +-
 test/other/codesize/test_codesize_hello_Os.size           | 2 +-
 test/other/codesize/test_codesize_hello_wasmfs.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 +-
 27 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/test/code_size/embind_hello_wasm.json b/test/code_size/embind_hello_wasm.json
index 9949abe5a670b..6312d6f4477b0 100644
--- a/test/code_size/embind_hello_wasm.json
+++ b/test/code_size/embind_hello_wasm.json
@@ -4,7 +4,7 @@
   "a.js": 9727,
   "a.js.gz": 4295,
   "a.wasm": 7728,
-  "a.wasm.gz": 3515,
+  "a.wasm.gz": 3519,
   "total": 18007,
-  "total_gz": 8190
+  "total_gz": 8194
 }
diff --git a/test/code_size/embind_val_wasm.json b/test/code_size/embind_val_wasm.json
index 0aa31c02c3739..50ca83fd15d93 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": 9558,
-  "a.wasm.gz": 4908,
-  "total": 16959,
-  "total_gz": 8235
+  "a.wasm": 9563,
+  "a.wasm.gz": 4919,
+  "total": 16964,
+  "total_gz": 8246
 }
diff --git a/test/code_size/hello_webgl2_wasm.json b/test/code_size/hello_webgl2_wasm.json
index a54d1785b3178..02421c94f9c0f 100644
--- a/test/code_size/hello_webgl2_wasm.json
+++ b/test/code_size/hello_webgl2_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 328,
   "a.js": 4531,
   "a.js.gz": 2312,
-  "a.wasm": 10402,
-  "a.wasm.gz": 6699,
-  "total": 15387,
-  "total_gz": 9339
+  "a.wasm": 10400,
+  "a.wasm.gz": 6694,
+  "total": 15385,
+  "total_gz": 9334
 }
diff --git a/test/code_size/hello_webgl2_wasm2js.json b/test/code_size/hello_webgl2_wasm2js.json
index c25ae0e284da7..9b45b773d35f1 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": 22204,
-  "a.js.gz": 11596,
-  "total": 22550,
-  "total_gz": 11858
+  "a.js": 22202,
+  "a.js.gz": 11587,
+  "total": 22548,
+  "total_gz": 11849
 }
diff --git a/test/code_size/hello_webgl_wasm.json b/test/code_size/hello_webgl_wasm.json
index a3938096fb557..f4c5980862072 100644
--- a/test/code_size/hello_webgl_wasm.json
+++ b/test/code_size/hello_webgl_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 328,
   "a.js": 4069,
   "a.js.gz": 2158,
-  "a.wasm": 10402,
-  "a.wasm.gz": 6699,
-  "total": 14925,
-  "total_gz": 9185
+  "a.wasm": 10400,
+  "a.wasm.gz": 6694,
+  "total": 14923,
+  "total_gz": 9180
 }
diff --git a/test/code_size/hello_webgl_wasm2js.json b/test/code_size/hello_webgl_wasm2js.json
index 3e8754513a95c..071d44c6d5131 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": 21730,
-  "a.js.gz": 11428,
-  "total": 22076,
-  "total_gz": 11690
+  "a.js": 21728,
+  "a.js.gz": 11418,
+  "total": 22074,
+  "total_gz": 11680
 }
diff --git a/test/code_size/math_wasm.json b/test/code_size/math_wasm.json
index 5328e0087d307..391e9180af9a3 100644
--- a/test/code_size/math_wasm.json
+++ b/test/code_size/math_wasm.json
@@ -4,7 +4,7 @@
   "a.js": 110,
   "a.js.gz": 125,
   "a.wasm": 2719,
-  "a.wasm.gz": 1673,
+  "a.wasm.gz": 1675,
   "total": 3381,
-  "total_gz": 2178
+  "total_gz": 2180
 }
diff --git a/test/code_size/random_printf_wasm.json b/test/code_size/random_printf_wasm.json
index bcfa0afce45db..7a055e7fd1fcd 100644
--- a/test/code_size/random_printf_wasm.json
+++ b/test/code_size/random_printf_wasm.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 12690,
-  "a.html.gz": 6857,
-  "total": 12690,
-  "total_gz": 6857
+  "a.html": 12694,
+  "a.html.gz": 6859,
+  "total": 12694,
+  "total_gz": 6859
 }
diff --git a/test/code_size/random_printf_wasm2js.json b/test/code_size/random_printf_wasm2js.json
index f80e7681628fe..0412ccf8bf4f4 100644
--- a/test/code_size/random_printf_wasm2js.json
+++ b/test/code_size/random_printf_wasm2js.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 17325,
-  "a.html.gz": 7507,
-  "total": 17325,
-  "total_gz": 7507
+  "a.html": 17280,
+  "a.html.gz": 7490,
+  "total": 17280,
+  "total_gz": 7490
 }
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.size b/test/other/codesize/test_codesize_cxx_ctors1.size
index 8dbf82db4bd53..45fc5ebbc180f 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.size
+++ b/test/other/codesize/test_codesize_cxx_ctors1.size
@@ -1 +1 @@
-129325
+129291
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.size b/test/other/codesize/test_codesize_cxx_ctors2.size
index 0a6eb06696eb3..1927b8824f928 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.size
+++ b/test/other/codesize/test_codesize_cxx_ctors2.size
@@ -1 +1 @@
-128771
+128737
diff --git a/test/other/codesize/test_codesize_cxx_except.size b/test/other/codesize/test_codesize_cxx_except.size
index b0ac542da834c..446ac3dafd7be 100644
--- a/test/other/codesize/test_codesize_cxx_except.size
+++ b/test/other/codesize/test_codesize_cxx_except.size
@@ -1 +1 @@
-171408
+171404
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.size b/test/other/codesize/test_codesize_cxx_except_wasm.size
index 83b37d84fd0a9..6277a66a91a74 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.size
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.size
@@ -1 +1 @@
-142532
+142507
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 8a9f04851cd11..6e9dd126cc358 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 @@
-145169
+145144
diff --git a/test/other/codesize/test_codesize_cxx_mangle.size b/test/other/codesize/test_codesize_cxx_mangle.size
index f7415471dcb89..d18c01e7bc4bb 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.size
+++ b/test/other/codesize/test_codesize_cxx_mangle.size
@@ -1 +1 @@
-232928
+232924
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.size b/test/other/codesize/test_codesize_cxx_noexcept.size
index 050fa02e0c7f9..bb292bbe843df 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.size
+++ b/test/other/codesize/test_codesize_cxx_noexcept.size
@@ -1 +1 @@
-132131
+132097
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.size b/test/other/codesize/test_codesize_cxx_wasmfs.size
index 26f6ca42f7d6a..4b74724677f0a 100644
--- a/test/other/codesize/test_codesize_cxx_wasmfs.size
+++ b/test/other/codesize/test_codesize_cxx_wasmfs.size
@@ -1 +1 @@
-169426
+169392
diff --git a/test/other/codesize/test_codesize_files_wasmfs.size b/test/other/codesize/test_codesize_files_wasmfs.size
index b493e90627b7c..77cfa8084867e 100644
--- a/test/other/codesize/test_codesize_files_wasmfs.size
+++ b/test/other/codesize/test_codesize_files_wasmfs.size
@@ -1 +1 @@
-50982
+50984
diff --git a/test/other/codesize/test_codesize_hello_O0.size b/test/other/codesize/test_codesize_hello_O0.size
index 507ba42c86fa0..28da763855e67 100644
--- a/test/other/codesize/test_codesize_hello_O0.size
+++ b/test/other/codesize/test_codesize_hello_O0.size
@@ -1 +1 @@
-14452
+14457
diff --git a/test/other/codesize/test_codesize_hello_O1.size b/test/other/codesize/test_codesize_hello_O1.size
index 5072a438edffb..1db299c003761 100644
--- a/test/other/codesize/test_codesize_hello_O1.size
+++ b/test/other/codesize/test_codesize_hello_O1.size
@@ -1 +1 @@
-2447
+2460
diff --git a/test/other/codesize/test_codesize_hello_O2.size b/test/other/codesize/test_codesize_hello_O2.size
index db0e38b0ee135..b6ac305674cf9 100644
--- a/test/other/codesize/test_codesize_hello_O2.size
+++ b/test/other/codesize/test_codesize_hello_O2.size
@@ -1 +1 @@
-2045
+2047
diff --git a/test/other/codesize/test_codesize_hello_O3.size b/test/other/codesize/test_codesize_hello_O3.size
index b0539e90d9ac1..173a6680f8970 100644
--- a/test/other/codesize/test_codesize_hello_O3.size
+++ b/test/other/codesize/test_codesize_hello_O3.size
@@ -1 +1 @@
-1735
+1737
diff --git a/test/other/codesize/test_codesize_hello_Os.size b/test/other/codesize/test_codesize_hello_Os.size
index 921f45ad4bffa..54c9fc81b32d0 100644
--- a/test/other/codesize/test_codesize_hello_Os.size
+++ b/test/other/codesize/test_codesize_hello_Os.size
@@ -1 +1 @@
-1726
+1728
diff --git a/test/other/codesize/test_codesize_hello_wasmfs.size b/test/other/codesize/test_codesize_hello_wasmfs.size
index b0539e90d9ac1..173a6680f8970 100644
--- a/test/other/codesize/test_codesize_hello_wasmfs.size
+++ b/test/other/codesize/test_codesize_hello_wasmfs.size
@@ -1 +1 @@
-1735
+1737
diff --git a/test/other/test_unoptimized_code_size.wasm.size b/test/other/test_unoptimized_code_size.wasm.size
index 507ba42c86fa0..28da763855e67 100644
--- a/test/other/test_unoptimized_code_size.wasm.size
+++ b/test/other/test_unoptimized_code_size.wasm.size
@@ -1 +1 @@
-14452
+14457
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 8d6661ddaf6c7..685cb30041c53 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 @@
-11642
+11650
diff --git a/test/other/test_unoptimized_code_size_strict.wasm.size b/test/other/test_unoptimized_code_size_strict.wasm.size
index 507ba42c86fa0..28da763855e67 100644
--- a/test/other/test_unoptimized_code_size_strict.wasm.size
+++ b/test/other/test_unoptimized_code_size_strict.wasm.size
@@ -1 +1 @@
-14452
+14457