Only check for WebAssembly support in debug builds. NFC

sbc100 · sbc100 · commit c4aed6203a1f · 2024-03-11T16:48:12.000-07:00
Also, avoid the use of `abort` in this case since abort itself depends on `WebAssembly.RuntimeError`. Fixes: #21484
diff --git 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
@@ -1 +1 @@
-9883
+9853
diff --git 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
@@ -1 +1 @@
-9866
+9836
diff --git 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
@@ -1 +1 @@
-10968
+10931
diff --git 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
@@ -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
@@ -1 +1 @@
-24204
+24136
diff --git 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
@@ -1 +1 @@
-28183
+28116
diff --git 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
@@ -1 +1 @@
-24310
+24243
diff --git 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
@@ -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
@@ -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
@@ -1 +1 @@
-19339
+19271
diff --git 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
@@ -1 +1 @@
-6875
+6808
diff --git 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
@@ -1 +1 @@
-7769
+7672
diff --git 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
@@ -1 +1 @@
-5530
+5437
diff --git 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
@@ -1 +1 @@
-5376
+5283
diff --git 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
@@ -1 +1 @@
-5376
+5283
diff --git 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
@@ -1 +1 @@
-5343
+5250
diff --git 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
@@ -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
@@ -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
@@ -1 +1 @@
-4162
+4072
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-4647
+4555
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-4647
+4555
diff --git 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
@@ -1 +1 @@
-3541
+3452
diff --git 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
@@ -1 +1 @@
-1796
+1755
diff --git 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
@@ -1 +1 @@
-1627
+1582
diff --git 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
@@ -1 +1 @@
-1591
+1546
diff --git 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
@@ -1 +1 @@
-1591
+1546
diff --git 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
@@ -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
@@ -1 +1 @@
-3222
+3133
diff --git 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
@@ -1 +1 @@
-3237
+3148
diff --git 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
@@ -1 +1 @@
-13569
+13501
diff --git 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
@@ -1 +1 @@
-3237
+3148
diff --git 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
@@ -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
@@ -1 +1 @@
-56716
+56714
diff --git 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
@@ -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 that in debug builds 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
