From 0597d35265ef3d2fd0e82040eadce644320ad701 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Mon, 11 Mar 2024 14:17:15 -0700 Subject: [PATCH] Only check for WebAssembly support in debug builds. NFC Also, avoid the use of `abort` in this case since abort itself depends on `WebAssembly.RuntimeError`. Fixes: #21484 --- src/preamble.js | 4 ++-- .../metadce/test_metadce_cxx_ctors1.gzsize | 2 +- .../metadce/test_metadce_cxx_ctors1.jssize | 2 +- .../metadce/test_metadce_cxx_ctors2.gzsize | 2 +- .../metadce/test_metadce_cxx_ctors2.jssize | 2 +- .../metadce/test_metadce_cxx_except.gzsize | 2 +- .../metadce/test_metadce_cxx_except.jssize | 2 +- .../test_metadce_cxx_except_wasm.gzsize | 2 +- .../test_metadce_cxx_except_wasm.jssize | 2 +- .../metadce/test_metadce_cxx_mangle.gzsize | 2 +- .../metadce/test_metadce_cxx_mangle.jssize | 2 +- .../metadce/test_metadce_cxx_noexcept.gzsize | 2 +- .../metadce/test_metadce_cxx_noexcept.jssize | 2 +- .../metadce/test_metadce_cxx_wasmfs.gzsize | 2 +- .../metadce/test_metadce_cxx_wasmfs.jssize | 2 +- .../metadce/test_metadce_files_js_fs.gzsize | 2 +- .../metadce/test_metadce_files_js_fs.jssize | 2 +- .../metadce/test_metadce_files_wasmfs.gzsize | 2 +- .../metadce/test_metadce_files_wasmfs.jssize | 2 +- .../other/metadce/test_metadce_hello_O1.gzsize | 2 +- .../other/metadce/test_metadce_hello_O1.jssize | 2 +- .../other/metadce/test_metadce_hello_O2.gzsize | 2 +- .../other/metadce/test_metadce_hello_O2.jssize | 2 +- .../other/metadce/test_metadce_hello_O3.gzsize | 2 +- .../other/metadce/test_metadce_hello_O3.jssize | 2 +- .../other/metadce/test_metadce_hello_Os.gzsize | 2 +- .../other/metadce/test_metadce_hello_Os.jssize | 2 +- .../other/metadce/test_metadce_hello_Oz.gzsize | 2 +- .../other/metadce/test_metadce_hello_Oz.jssize | 2 +- .../metadce/test_metadce_hello_dylink.gzsize | 2 +- .../metadce/test_metadce_hello_dylink.jssize | 2 +- .../test_metadce_hello_export_nothing.gzsize | 2 +- .../test_metadce_hello_export_nothing.jssize | 2 +- .../metadce/test_metadce_hello_wasmfs.gzsize | 2 +- .../metadce/test_metadce_hello_wasmfs.jssize | 2 +- .../test_metadce_libcxxabi_message_O3.gzsize | 2 +- .../test_metadce_libcxxabi_message_O3.jssize | 2 +- ...adce_libcxxabi_message_O3_standalone.gzsize | 2 +- ...adce_libcxxabi_message_O3_standalone.jssize | 2 +- test/other/metadce/test_metadce_mem_O3.gzsize | 2 +- test/other/metadce/test_metadce_mem_O3.jssize | 2 +- .../metadce/test_metadce_mem_O3_grow.gzsize | 2 +- .../metadce/test_metadce_mem_O3_grow.jssize | 2 +- .../test_metadce_mem_O3_grow_standalone.gzsize | 2 +- .../test_metadce_mem_O3_grow_standalone.jssize | 2 +- .../test_metadce_mem_O3_standalone.gzsize | 2 +- .../test_metadce_mem_O3_standalone.jssize | 2 +- .../test_metadce_mem_O3_standalone_lib.gzsize | 2 +- .../test_metadce_mem_O3_standalone_lib.jssize | 2 +- .../test_metadce_mem_O3_standalone_narg.gzsize | 2 +- .../test_metadce_mem_O3_standalone_narg.jssize | 2 +- ..._metadce_mem_O3_standalone_narg_flto.gzsize | 2 +- ..._metadce_mem_O3_standalone_narg_flto.jssize | 2 +- .../metadce/test_metadce_minimal_64.gzsize | 2 +- .../metadce/test_metadce_minimal_64.jssize | 2 +- .../metadce/test_metadce_minimal_O0.gzsize | 2 +- .../metadce/test_metadce_minimal_O1.gzsize | 2 +- .../metadce/test_metadce_minimal_O1.jssize | 2 +- .../metadce/test_metadce_minimal_O2.gzsize | 2 +- .../metadce/test_metadce_minimal_O2.jssize | 2 +- .../metadce/test_metadce_minimal_O3.gzsize | 2 +- .../metadce/test_metadce_minimal_O3.jssize | 2 +- .../metadce/test_metadce_minimal_Os.gzsize | 2 +- .../metadce/test_metadce_minimal_Os.jssize | 2 +- .../test_metadce_minimal_Oz-ctors.gzsize | 2 +- .../test_metadce_minimal_Oz-ctors.jssize | 2 +- .../metadce/test_metadce_minimal_Oz.gzsize | 2 +- .../metadce/test_metadce_minimal_Oz.jssize | 2 +- .../test_metadce_minimal_pthreads.gzsize | 2 +- .../test_metadce_minimal_pthreads.jssize | 2 +- .../metadce/test_metadce_minimal_wasmfs.gzsize | 2 +- .../metadce/test_metadce_minimal_wasmfs.jssize | 2 +- test/other/test_unoptimized_code_size.js.size | 2 +- ...st_unoptimized_code_size_no_asserts.js.size | 2 +- .../test_unoptimized_code_size_strict.js.size | 2 +- test/test_browser.py | 2 +- test/test_other.py | 18 ++++++++++-------- 77 files changed, 87 insertions(+), 85 deletions(-) diff --git a/src/preamble.js b/src/preamble.js index bb68f1d2525f4..7a543660338ac 100644 --- a/src/preamble.js +++ b/src/preamble.js @@ -30,9 +30,9 @@ if (Module['doWasm2JS']) { #endif #endif -#if WASM == 1 +#if ASSERTIONS && WASM == 1 if (typeof WebAssembly != 'object') { - abort('no native wasm support detected'); + err('no native wasm support detected'); } #endif diff --git a/test/other/metadce/test_metadce_cxx_ctors1.gzsize b/test/other/metadce/test_metadce_cxx_ctors1.gzsize index aa902cabe050d..697ddcb92ff16 100644 --- a/test/other/metadce/test_metadce_cxx_ctors1.gzsize +++ b/test/other/metadce/test_metadce_cxx_ctors1.gzsize @@ -1 +1 @@ -9883 +9853 diff --git a/test/other/metadce/test_metadce_cxx_ctors1.jssize b/test/other/metadce/test_metadce_cxx_ctors1.jssize index 3cad9c9ad5f68..c1fab9771c5fe 100644 --- a/test/other/metadce/test_metadce_cxx_ctors1.jssize +++ b/test/other/metadce/test_metadce_cxx_ctors1.jssize @@ -1 +1 @@ -24310 +24243 diff --git a/test/other/metadce/test_metadce_cxx_ctors2.gzsize b/test/other/metadce/test_metadce_cxx_ctors2.gzsize index 15cad531f0200..15f1a2b640232 100644 --- a/test/other/metadce/test_metadce_cxx_ctors2.gzsize +++ b/test/other/metadce/test_metadce_cxx_ctors2.gzsize @@ -1 +1 @@ -9866 +9836 diff --git a/test/other/metadce/test_metadce_cxx_ctors2.jssize b/test/other/metadce/test_metadce_cxx_ctors2.jssize index 89f2ddba1b3d7..949d2d6e1c177 100644 --- a/test/other/metadce/test_metadce_cxx_ctors2.jssize +++ b/test/other/metadce/test_metadce_cxx_ctors2.jssize @@ -1 +1 @@ -24278 +24211 diff --git a/test/other/metadce/test_metadce_cxx_except.gzsize b/test/other/metadce/test_metadce_cxx_except.gzsize index 146e6e733deee..636cf90353a99 100644 --- a/test/other/metadce/test_metadce_cxx_except.gzsize +++ b/test/other/metadce/test_metadce_cxx_except.gzsize @@ -1 +1 @@ -10968 +10931 diff --git a/test/other/metadce/test_metadce_cxx_except.jssize b/test/other/metadce/test_metadce_cxx_except.jssize index cf7480af53c6a..8ba1476eb86fc 100644 --- a/test/other/metadce/test_metadce_cxx_except.jssize +++ b/test/other/metadce/test_metadce_cxx_except.jssize @@ -1 +1 @@ -28182 +28115 diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.gzsize b/test/other/metadce/test_metadce_cxx_except_wasm.gzsize index 34cf2a336a2c6..cbcec796e662f 100644 --- a/test/other/metadce/test_metadce_cxx_except_wasm.gzsize +++ b/test/other/metadce/test_metadce_cxx_except_wasm.gzsize @@ -1 +1 @@ -9850 +9818 diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.jssize b/test/other/metadce/test_metadce_cxx_except_wasm.jssize index f1f6f0cd0bb35..b94a79f30b5ac 100644 --- a/test/other/metadce/test_metadce_cxx_except_wasm.jssize +++ b/test/other/metadce/test_metadce_cxx_except_wasm.jssize @@ -1 +1 @@ -24204 +24136 diff --git a/test/other/metadce/test_metadce_cxx_mangle.gzsize b/test/other/metadce/test_metadce_cxx_mangle.gzsize index abcda8b3df866..2ba0481d05fa9 100644 --- a/test/other/metadce/test_metadce_cxx_mangle.gzsize +++ b/test/other/metadce/test_metadce_cxx_mangle.gzsize @@ -1 +1 @@ -10979 +10939 diff --git a/test/other/metadce/test_metadce_cxx_mangle.jssize b/test/other/metadce/test_metadce_cxx_mangle.jssize index 9177a914a21eb..c08574dd53d92 100644 --- a/test/other/metadce/test_metadce_cxx_mangle.jssize +++ b/test/other/metadce/test_metadce_cxx_mangle.jssize @@ -1 +1 @@ -28183 +28116 diff --git a/test/other/metadce/test_metadce_cxx_noexcept.gzsize b/test/other/metadce/test_metadce_cxx_noexcept.gzsize index aa902cabe050d..697ddcb92ff16 100644 --- a/test/other/metadce/test_metadce_cxx_noexcept.gzsize +++ b/test/other/metadce/test_metadce_cxx_noexcept.gzsize @@ -1 +1 @@ -9883 +9853 diff --git a/test/other/metadce/test_metadce_cxx_noexcept.jssize b/test/other/metadce/test_metadce_cxx_noexcept.jssize index 3cad9c9ad5f68..c1fab9771c5fe 100644 --- a/test/other/metadce/test_metadce_cxx_noexcept.jssize +++ b/test/other/metadce/test_metadce_cxx_noexcept.jssize @@ -1 +1 @@ -24310 +24243 diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.gzsize b/test/other/metadce/test_metadce_cxx_wasmfs.gzsize index 87d9fa61e6774..cb1346a82ce87 100644 --- a/test/other/metadce/test_metadce_cxx_wasmfs.gzsize +++ b/test/other/metadce/test_metadce_cxx_wasmfs.gzsize @@ -1 +1 @@ -5245 +5212 diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.jssize b/test/other/metadce/test_metadce_cxx_wasmfs.jssize index e15496f7124ea..4f9ecc9633ccc 100644 --- a/test/other/metadce/test_metadce_cxx_wasmfs.jssize +++ b/test/other/metadce/test_metadce_cxx_wasmfs.jssize @@ -1 +1 @@ -12122 +12055 diff --git a/test/other/metadce/test_metadce_files_js_fs.gzsize b/test/other/metadce/test_metadce_files_js_fs.gzsize index d01797194d005..47c1c174f8fe1 100644 --- a/test/other/metadce/test_metadce_files_js_fs.gzsize +++ b/test/other/metadce/test_metadce_files_js_fs.gzsize @@ -1 +1 @@ -7840 +7813 diff --git a/test/other/metadce/test_metadce_files_js_fs.jssize b/test/other/metadce/test_metadce_files_js_fs.jssize index a4192e7c24a28..cf9094240295e 100644 --- a/test/other/metadce/test_metadce_files_js_fs.jssize +++ b/test/other/metadce/test_metadce_files_js_fs.jssize @@ -1 +1 @@ -19339 +19271 diff --git a/test/other/metadce/test_metadce_files_wasmfs.gzsize b/test/other/metadce/test_metadce_files_wasmfs.gzsize index 71e9c9687b826..26770e37ce36d 100644 --- a/test/other/metadce/test_metadce_files_wasmfs.gzsize +++ b/test/other/metadce/test_metadce_files_wasmfs.gzsize @@ -1 +1 @@ -3165 +3134 diff --git a/test/other/metadce/test_metadce_files_wasmfs.jssize b/test/other/metadce/test_metadce_files_wasmfs.jssize index 39864fee7c8f6..6a3fff47e3652 100644 --- a/test/other/metadce/test_metadce_files_wasmfs.jssize +++ b/test/other/metadce/test_metadce_files_wasmfs.jssize @@ -1 +1 @@ -6875 +6808 diff --git a/test/other/metadce/test_metadce_hello_O1.gzsize b/test/other/metadce/test_metadce_hello_O1.gzsize index fd1dbd889d1f9..891c972bcfbe1 100644 --- a/test/other/metadce/test_metadce_hello_O1.gzsize +++ b/test/other/metadce/test_metadce_hello_O1.gzsize @@ -1 +1 @@ -3016 +2973 diff --git a/test/other/metadce/test_metadce_hello_O1.jssize b/test/other/metadce/test_metadce_hello_O1.jssize index 4fae262bf9b02..25ab6d9472e71 100644 --- a/test/other/metadce/test_metadce_hello_O1.jssize +++ b/test/other/metadce/test_metadce_hello_O1.jssize @@ -1 +1 @@ -7769 +7672 diff --git a/test/other/metadce/test_metadce_hello_O2.gzsize b/test/other/metadce/test_metadce_hello_O2.gzsize index 71150e8800dcc..8ba45d3fff1fc 100644 --- a/test/other/metadce/test_metadce_hello_O2.gzsize +++ b/test/other/metadce/test_metadce_hello_O2.gzsize @@ -1 +1 @@ -2661 +2616 diff --git a/test/other/metadce/test_metadce_hello_O2.jssize b/test/other/metadce/test_metadce_hello_O2.jssize index bad2b418d646f..235dc568ba099 100644 --- a/test/other/metadce/test_metadce_hello_O2.jssize +++ b/test/other/metadce/test_metadce_hello_O2.jssize @@ -1 +1 @@ -5530 +5437 diff --git a/test/other/metadce/test_metadce_hello_O3.gzsize b/test/other/metadce/test_metadce_hello_O3.gzsize index e2c12dfcdca3e..48c6e93066ff9 100644 --- a/test/other/metadce/test_metadce_hello_O3.gzsize +++ b/test/other/metadce/test_metadce_hello_O3.gzsize @@ -1 +1 @@ -2577 +2535 diff --git a/test/other/metadce/test_metadce_hello_O3.jssize b/test/other/metadce/test_metadce_hello_O3.jssize index 6905a2a4ed94f..a8e87c7e3a844 100644 --- a/test/other/metadce/test_metadce_hello_O3.jssize +++ b/test/other/metadce/test_metadce_hello_O3.jssize @@ -1 +1 @@ -5376 +5283 diff --git a/test/other/metadce/test_metadce_hello_Os.gzsize b/test/other/metadce/test_metadce_hello_Os.gzsize index e2c12dfcdca3e..48c6e93066ff9 100644 --- a/test/other/metadce/test_metadce_hello_Os.gzsize +++ b/test/other/metadce/test_metadce_hello_Os.gzsize @@ -1 +1 @@ -2577 +2535 diff --git a/test/other/metadce/test_metadce_hello_Os.jssize b/test/other/metadce/test_metadce_hello_Os.jssize index 6905a2a4ed94f..a8e87c7e3a844 100644 --- a/test/other/metadce/test_metadce_hello_Os.jssize +++ b/test/other/metadce/test_metadce_hello_Os.jssize @@ -1 +1 @@ -5376 +5283 diff --git a/test/other/metadce/test_metadce_hello_Oz.gzsize b/test/other/metadce/test_metadce_hello_Oz.gzsize index aed4b56065d98..4bb254ea8effb 100644 --- a/test/other/metadce/test_metadce_hello_Oz.gzsize +++ b/test/other/metadce/test_metadce_hello_Oz.gzsize @@ -1 +1 @@ -2558 +2519 diff --git a/test/other/metadce/test_metadce_hello_Oz.jssize b/test/other/metadce/test_metadce_hello_Oz.jssize index 0cf9f71ea3b88..b62acb1b92fc3 100644 --- a/test/other/metadce/test_metadce_hello_Oz.jssize +++ b/test/other/metadce/test_metadce_hello_Oz.jssize @@ -1 +1 @@ -5343 +5250 diff --git a/test/other/metadce/test_metadce_hello_dylink.gzsize b/test/other/metadce/test_metadce_hello_dylink.gzsize index 288a9a5cb071d..91f10036677a4 100644 --- a/test/other/metadce/test_metadce_hello_dylink.gzsize +++ b/test/other/metadce/test_metadce_hello_dylink.gzsize @@ -1 +1 @@ -6459 +6428 diff --git a/test/other/metadce/test_metadce_hello_dylink.jssize b/test/other/metadce/test_metadce_hello_dylink.jssize index 285a7cc7e75ee..aa22e7f865eec 100644 --- a/test/other/metadce/test_metadce_hello_dylink.jssize +++ b/test/other/metadce/test_metadce_hello_dylink.jssize @@ -1 +1 @@ -14303 +14235 diff --git a/test/other/metadce/test_metadce_hello_export_nothing.gzsize b/test/other/metadce/test_metadce_hello_export_nothing.gzsize index 679d3a3805feb..6eaca3f62c48f 100644 --- a/test/other/metadce/test_metadce_hello_export_nothing.gzsize +++ b/test/other/metadce/test_metadce_hello_export_nothing.gzsize @@ -1 +1 @@ -1931 +1888 diff --git a/test/other/metadce/test_metadce_hello_export_nothing.jssize b/test/other/metadce/test_metadce_hello_export_nothing.jssize index c933f5ac41e53..75b434a98100e 100644 --- a/test/other/metadce/test_metadce_hello_export_nothing.jssize +++ b/test/other/metadce/test_metadce_hello_export_nothing.jssize @@ -1 +1 @@ -4162 +4072 diff --git a/test/other/metadce/test_metadce_hello_wasmfs.gzsize b/test/other/metadce/test_metadce_hello_wasmfs.gzsize index e2c12dfcdca3e..48c6e93066ff9 100644 --- a/test/other/metadce/test_metadce_hello_wasmfs.gzsize +++ b/test/other/metadce/test_metadce_hello_wasmfs.gzsize @@ -1 +1 @@ -2577 +2535 diff --git a/test/other/metadce/test_metadce_hello_wasmfs.jssize b/test/other/metadce/test_metadce_hello_wasmfs.jssize index 6905a2a4ed94f..a8e87c7e3a844 100644 --- a/test/other/metadce/test_metadce_hello_wasmfs.jssize +++ b/test/other/metadce/test_metadce_hello_wasmfs.jssize @@ -1 +1 @@ -5376 +5283 diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize b/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize index 6a4fd21351996..3fe6b20bd94b5 100644 --- a/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize +++ b/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize @@ -1 +1 @@ -2141 +2099 diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize b/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize index 148775a33a8cb..1d0d39c1edb0b 100644 --- a/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize +++ b/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize @@ -1 +1 @@ -4596 +4506 diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize index b62c68ea1f5da..87c9795e2f9b3 100644 --- a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize +++ b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize @@ -1 +1 @@ -2173 +2135 diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize index 209cee3145098..de06269316f50 100644 --- a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize +++ b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize @@ -1 +1 @@ -4647 +4555 diff --git a/test/other/metadce/test_metadce_mem_O3.gzsize b/test/other/metadce/test_metadce_mem_O3.gzsize index 49d31a38a5fd2..f9aadb0404289 100644 --- a/test/other/metadce/test_metadce_mem_O3.gzsize +++ b/test/other/metadce/test_metadce_mem_O3.gzsize @@ -1 +1 @@ -2595 +2563 diff --git a/test/other/metadce/test_metadce_mem_O3.jssize b/test/other/metadce/test_metadce_mem_O3.jssize index edfd71e8f6777..999779ae9b8e8 100644 --- a/test/other/metadce/test_metadce_mem_O3.jssize +++ b/test/other/metadce/test_metadce_mem_O3.jssize @@ -1 +1 @@ -5496 +5428 diff --git a/test/other/metadce/test_metadce_mem_O3_grow.gzsize b/test/other/metadce/test_metadce_mem_O3_grow.gzsize index 6fb071591d88a..e41db8b9db9a2 100644 --- a/test/other/metadce/test_metadce_mem_O3_grow.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_grow.gzsize @@ -1 +1 @@ -2754 +2712 diff --git a/test/other/metadce/test_metadce_mem_O3_grow.jssize b/test/other/metadce/test_metadce_mem_O3_grow.jssize index c9a4db7eba921..782d37093ed65 100644 --- a/test/other/metadce/test_metadce_mem_O3_grow.jssize +++ b/test/other/metadce/test_metadce_mem_O3_grow.jssize @@ -1 +1 @@ -5818 +5726 diff --git a/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize b/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize index ac54f8beded56..6ee72971bf63e 100644 --- a/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize @@ -1 +1 @@ -2445 +2403 diff --git a/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize b/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize index 4dd60d34b0580..424f397be4bde 100644 --- a/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize +++ b/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize @@ -1 +1 @@ -5206 +5113 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone.gzsize index 7cce2de38675e..cc278bd694d3e 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_standalone.gzsize @@ -1 +1 @@ -2411 +2369 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.jssize b/test/other/metadce/test_metadce_mem_O3_standalone.jssize index 4488f39a24ed7..611e4315f299b 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone.jssize +++ b/test/other/metadce/test_metadce_mem_O3_standalone.jssize @@ -1 +1 @@ -5136 +5044 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize index 1905eb8fcd709..ea2d7fdefc0ea 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize @@ -1 +1 @@ -2163 +2122 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize index 209cee3145098..8a2e00225f222 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize @@ -1 +1 @@ -4647 +4557 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize index b62c68ea1f5da..87c9795e2f9b3 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize @@ -1 +1 @@ -2173 +2135 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize index 209cee3145098..de06269316f50 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize @@ -1 +1 @@ -4647 +4555 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize index b62c68ea1f5da..87c9795e2f9b3 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize @@ -1 +1 @@ -2173 +2135 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize index 209cee3145098..de06269316f50 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize @@ -1 +1 @@ -4647 +4555 diff --git a/test/other/metadce/test_metadce_minimal_64.gzsize b/test/other/metadce/test_metadce_minimal_64.gzsize index e41cd7af59017..54a4c5bed47c8 100644 --- a/test/other/metadce/test_metadce_minimal_64.gzsize +++ b/test/other/metadce/test_metadce_minimal_64.gzsize @@ -1 +1 @@ -1685 +1640 diff --git a/test/other/metadce/test_metadce_minimal_64.jssize b/test/other/metadce/test_metadce_minimal_64.jssize index c9818c5c65dfe..80b87f13ca124 100644 --- a/test/other/metadce/test_metadce_minimal_64.jssize +++ b/test/other/metadce/test_metadce_minimal_64.jssize @@ -1 +1 @@ -3541 +3452 diff --git a/test/other/metadce/test_metadce_minimal_O0.gzsize b/test/other/metadce/test_metadce_minimal_O0.gzsize index d24406713de24..329076ac747e2 100644 --- a/test/other/metadce/test_metadce_minimal_O0.gzsize +++ b/test/other/metadce/test_metadce_minimal_O0.gzsize @@ -1 +1 @@ -6851 +6854 diff --git a/test/other/metadce/test_metadce_minimal_O1.gzsize b/test/other/metadce/test_metadce_minimal_O1.gzsize index b4c6992e70a85..2358ac3b44c5e 100644 --- a/test/other/metadce/test_metadce_minimal_O1.gzsize +++ b/test/other/metadce/test_metadce_minimal_O1.gzsize @@ -1 +1 @@ -1796 +1755 diff --git a/test/other/metadce/test_metadce_minimal_O1.jssize b/test/other/metadce/test_metadce_minimal_O1.jssize index fbb5de3eafa10..2f88f0025b084 100644 --- a/test/other/metadce/test_metadce_minimal_O1.jssize +++ b/test/other/metadce/test_metadce_minimal_O1.jssize @@ -1 +1 @@ -4328 +4232 diff --git a/test/other/metadce/test_metadce_minimal_O2.gzsize b/test/other/metadce/test_metadce_minimal_O2.gzsize index 0e1b3bc636564..f137a5639eff0 100644 --- a/test/other/metadce/test_metadce_minimal_O2.gzsize +++ b/test/other/metadce/test_metadce_minimal_O2.gzsize @@ -1 +1 @@ -1627 +1582 diff --git a/test/other/metadce/test_metadce_minimal_O2.jssize b/test/other/metadce/test_metadce_minimal_O2.jssize index c0fac8d63000c..c8ae07717b06b 100644 --- a/test/other/metadce/test_metadce_minimal_O2.jssize +++ b/test/other/metadce/test_metadce_minimal_O2.jssize @@ -1 +1 @@ -3287 +3198 diff --git a/test/other/metadce/test_metadce_minimal_O3.gzsize b/test/other/metadce/test_metadce_minimal_O3.gzsize index 4b24aeddf584f..e19b378c27520 100644 --- a/test/other/metadce/test_metadce_minimal_O3.gzsize +++ b/test/other/metadce/test_metadce_minimal_O3.gzsize @@ -1 +1 @@ -1591 +1546 diff --git a/test/other/metadce/test_metadce_minimal_O3.jssize b/test/other/metadce/test_metadce_minimal_O3.jssize index c23f53c20b3d4..3438fb6971651 100644 --- a/test/other/metadce/test_metadce_minimal_O3.jssize +++ b/test/other/metadce/test_metadce_minimal_O3.jssize @@ -1 +1 @@ -3237 +3148 diff --git a/test/other/metadce/test_metadce_minimal_Os.gzsize b/test/other/metadce/test_metadce_minimal_Os.gzsize index 4b24aeddf584f..e19b378c27520 100644 --- a/test/other/metadce/test_metadce_minimal_Os.gzsize +++ b/test/other/metadce/test_metadce_minimal_Os.gzsize @@ -1 +1 @@ -1591 +1546 diff --git a/test/other/metadce/test_metadce_minimal_Os.jssize b/test/other/metadce/test_metadce_minimal_Os.jssize index c23f53c20b3d4..3438fb6971651 100644 --- a/test/other/metadce/test_metadce_minimal_Os.jssize +++ b/test/other/metadce/test_metadce_minimal_Os.jssize @@ -1 +1 @@ -3237 +3148 diff --git a/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize b/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize index 2907ff5833601..576784f7d16b2 100644 --- a/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize +++ b/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize @@ -1 +1 @@ -1583 +1538 diff --git a/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize b/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize index 28206c2881752..48a627be48428 100644 --- a/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize +++ b/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize @@ -1 +1 @@ -3222 +3133 diff --git a/test/other/metadce/test_metadce_minimal_Oz.gzsize b/test/other/metadce/test_metadce_minimal_Oz.gzsize index 4b24aeddf584f..e19b378c27520 100644 --- a/test/other/metadce/test_metadce_minimal_Oz.gzsize +++ b/test/other/metadce/test_metadce_minimal_Oz.gzsize @@ -1 +1 @@ -1591 +1546 diff --git a/test/other/metadce/test_metadce_minimal_Oz.jssize b/test/other/metadce/test_metadce_minimal_Oz.jssize index c23f53c20b3d4..3438fb6971651 100644 --- a/test/other/metadce/test_metadce_minimal_Oz.jssize +++ b/test/other/metadce/test_metadce_minimal_Oz.jssize @@ -1 +1 @@ -3237 +3148 diff --git a/test/other/metadce/test_metadce_minimal_pthreads.gzsize b/test/other/metadce/test_metadce_minimal_pthreads.gzsize index 3c0e933c139cb..86a2a1bb17b2e 100644 --- a/test/other/metadce/test_metadce_minimal_pthreads.gzsize +++ b/test/other/metadce/test_metadce_minimal_pthreads.gzsize @@ -1 +1 @@ -4921 +4892 diff --git a/test/other/metadce/test_metadce_minimal_pthreads.jssize b/test/other/metadce/test_metadce_minimal_pthreads.jssize index 47aac242f9ac2..69d83d106207c 100644 --- a/test/other/metadce/test_metadce_minimal_pthreads.jssize +++ b/test/other/metadce/test_metadce_minimal_pthreads.jssize @@ -1 +1 @@ -13569 +13501 diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.gzsize b/test/other/metadce/test_metadce_minimal_wasmfs.gzsize index 4b24aeddf584f..e19b378c27520 100644 --- a/test/other/metadce/test_metadce_minimal_wasmfs.gzsize +++ b/test/other/metadce/test_metadce_minimal_wasmfs.gzsize @@ -1 +1 @@ -1591 +1546 diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.jssize b/test/other/metadce/test_metadce_minimal_wasmfs.jssize index c23f53c20b3d4..3438fb6971651 100644 --- a/test/other/metadce/test_metadce_minimal_wasmfs.jssize +++ b/test/other/metadce/test_metadce_minimal_wasmfs.jssize @@ -1 +1 @@ -3237 +3148 diff --git a/test/other/test_unoptimized_code_size.js.size b/test/other/test_unoptimized_code_size.js.size index 30b93bc6b4bdb..4f3e80c5400f8 100644 --- a/test/other/test_unoptimized_code_size.js.size +++ b/test/other/test_unoptimized_code_size.js.size @@ -1 +1 @@ -57813 +57811 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 996164ae69368..bed7ad636453e 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 @@ -31565 +31480 diff --git a/test/other/test_unoptimized_code_size_strict.js.size b/test/other/test_unoptimized_code_size_strict.js.size index 65ba3c68c0334..1bea62907f936 100644 --- a/test/other/test_unoptimized_code_size_strict.js.size +++ b/test/other/test_unoptimized_code_size_strict.js.size @@ -1 +1 @@ -56716 +56714 diff --git a/test/test_browser.py b/test/test_browser.py index c58099a5df6c0..d4555aaf554a2 100644 --- a/test/test_browser.py +++ b/test/test_browser.py @@ -4332,7 +4332,7 @@ def test_small_js_flags(self): print('size:', size) # Note that this size includes test harness additions (for reporting the result, etc.). if not self.is_wasm64() and not self.is_2gb(): - self.assertLess(abs(size - 4800), 100) + self.assertLess(abs(size - 4675), 100) # Tests that it is possible to initialize and render WebGL content in a # pthread by using OffscreenCanvas. diff --git a/test/test_other.py b/test/test_other.py index fc2507091312b..3989126de79e8 100644 --- a/test/test_other.py +++ b/test/test_other.py @@ -8822,14 +8822,16 @@ def test_lto_wasm_exceptions(self): self.emcc_args += ['-fwasm-exceptions', '-flto'] self.do_run_in_out_file_test('core/test_exceptions.cpp', out_suffix='_caught') - def test_wasm_nope(self): - for opts in [[], ['-O2']]: - print(opts) - # check we show a good error message if there is no wasm support - create_file('pre.js', 'WebAssembly = undefined;\n') - self.run_process([EMCC, test_file('hello_world.c'), '--pre-js', 'pre.js'] + opts) - out = self.run_js('a.out.js', assert_returncode=NON_ZERO) - self.assertContained('no native wasm support detected', out) + @parameterized({ + '': ([],), + 'O2': (['-O2'],), + }) + def test_missing_wasm(self, args): + # check we show a good error message if there is no wasm support + create_file('pre.js', 'WebAssembly = undefined;\n') + self.run_process([EMCC, test_file('hello_world.c'), '--pre-js', 'pre.js'] + args) + out = self.run_js('a.out.js', assert_returncode=NON_ZERO) + self.assertContainedIf('no native wasm support detected', out, not args) def test_exceptions_c_linker(self): # Test that we don't try to create __cxa_find_matching_catch_xx function automatically