[EH] Add more manual tests for new Wasm EH

The testing mode for the new Wasm EH (exnref) was added in
`with_all_eh_sjlj` and `with_all_sjlj` in emscripten-core#21906. But this adds the new
Wasm EH test mode for more tests that are not covered by those
decorators.

Author: aheejin

test/other/metadce/test_metadce_cxx_except_wasm_exnref.exports

@@ -0,0 +1,11 @@
+__indirect_function_table
+__trap
+__wasm_call_ctors
+_emscripten_stack_alloc
+dynCall_iiiiiijj
+dynCall_iiiiij
+dynCall_iiiiijj
+dynCall_jiji
+dynCall_viijii
+main
+memory

test/other/metadce/test_metadce_cxx_except_wasm_exnref.gzsize

@@ -0,0 +1 @@
+9807

test/other/metadce/test_metadce_cxx_except_wasm_exnref.imports

@@ -0,0 +1,10 @@
+env._abort_js
+env._emscripten_memcpy_js
+env.emscripten_resize_heap
+env.strftime_l
+wasi_snapshot_preview1.environ_get
+wasi_snapshot_preview1.environ_sizes_get
+wasi_snapshot_preview1.fd_close
+wasi_snapshot_preview1.fd_read
+wasi_snapshot_preview1.fd_seek
+wasi_snapshot_preview1.fd_write

test/other/metadce/test_metadce_cxx_except_wasm_exnref.jssize

@@ -0,0 +1 @@
+24140

test/other/metadce/test_metadce_cxx_except_wasm_exnref.sent

@@ -0,0 +1,10 @@
+_abort_js
+_emscripten_memcpy_js
+emscripten_resize_heap
+environ_get
+environ_sizes_get
+fd_close
+fd_read
+fd_seek
+fd_write
+strftime_l

test/other/metadce/test_metadce_cxx_except_wasm_exnref.size

@@ -0,0 +1 @@
+141975

test/test_core.py

@@ -915,6 +915,10 @@ def test_longjmp_with_and_without_exceptions(self):
     self.emcc_args.append('-fwasm-exceptions')
     for arg in ['-fwasm-exceptions', '-fno-exceptions']:
       self.do_core_test('test_longjmp.c', emcc_args=[arg])
+    # Wasm SjLj with and with new experimental EH support
+    self.require_new_wasm_eh()
+    self.set_setting('WASM_EXNREF')
+    self.do_core_test('test_longjmp.c', emcc_args=['-fwasm-exceptions'])
 
   @with_all_sjlj
   def test_longjmp2(self):
@@ -1051,6 +1055,12 @@ def test_exceptions_with_and_without_longjmp(self):
     for support_longjmp in [0, 'wasm']:
       self.set_setting('SUPPORT_LONGJMP', support_longjmp)
       self.do_run_in_out_file_test('core/test_exceptions.cpp', out_suffix='_caught')
+    # Wasm new experimental EH with and without Wasm SjLj support
+    self.require_new_wasm_eh()
+    self.set_setting('WASM_EXNREF')
+    for support_longjmp in [0, 'wasm']:
+      self.set_setting('SUPPORT_LONGJMP', support_longjmp)
+      self.do_run_in_out_file_test('core/test_exceptions.cpp', out_suffix='_caught')
 
   def test_exceptions_off(self):
     self.set_setting('DISABLE_EXCEPTION_CATCHING')

test/test_other.py

@@ -3298,13 +3298,16 @@ def test_embind_tsgen_memory64(self):
     self.assertFileContents(test_file('other/embind_tsgen_memory64.d.ts'), read_file('embind_tsgen_memory64.d.ts'))
 
   def test_embind_tsgen_exceptions(self):
-    # Check that when Wasm exceptions and assertions are enabled bindings still generate.
-    self.run_process([EMXX, test_file('other/embind_tsgen.cpp'),
-                      '-lembind', '-fwasm-exceptions', '-sASSERTIONS',
-                      # Use the deprecated `--embind-emit-tsd` to ensure it
-                      # still works until removed.
-                      '--embind-emit-tsd', 'embind_tsgen.d.ts', '-Wno-deprecated'])
-    self.assertFileContents(test_file('other/embind_tsgen.d.ts'), read_file('embind_tsgen.d.ts'))
+    for wasm_exnref in [0, 1]:
+      self.set_setting('WASM_EXNREF', wasm_exnref)
+      # Check that when Wasm exceptions and assertions are enabled bindings still generate.
+      self.run_process([EMXX, test_file('other/embind_tsgen.cpp'),
+                        '-lembind', '-fwasm-exceptions', '-sASSERTIONS',
+                        # Use the deprecated `--embind-emit-tsd` to ensure it
+                        # still works until removed.
+                        '--embind-emit-tsd', 'embind_tsgen.d.ts', '-Wno-deprecated']
+                       + self.get_emcc_args())
+      self.assertFileContents(test_file('other/embind_tsgen.d.ts'), read_file('embind_tsgen.d.ts'))
 
   def test_embind_jsgen_method_pointer_stability(self):
     self.emcc_args += ['-lembind', '-sEMBIND_AOT']
@@ -8531,6 +8534,7 @@ def test_metadce_minimal_pthreads(self):
                   '-sDEMANGLE_SUPPORT', '-Wno-deprecated'], [], ['waka']), # noqa
     # Wasm EH's code size increase is smaller than that of Emscripten EH
     'except_wasm':   (['-O2', '-fwasm-exceptions'], [], ['waka']), # noqa
+    'except_wasm_exnref':   (['-O2', '-fwasm-exceptions', '-sWASM_EXNREF'], [], ['waka']), # noqa
     # eval_ctors 1 can partially optimize, but runs into getenv() for locale
     # code. mode 2 ignores those and fully optimizes out the ctors
     'ctors1':    (['-O2', '-sEVAL_CTORS'],   [], ['waka']), # noqa
@@ -8830,7 +8834,8 @@ def test_lto(self, args):
   @parameterized({
     'noexcept': [],
     'except': ['-sDISABLE_EXCEPTION_CATCHING=0'],
-    'except_wasm': ['-fwasm-exceptions']
+    'except_wasm': ['-fwasm-exceptions'],
+    'except_wasm_exnref': ['-fwasm-exceptions', '-sWASM_EXNREF']
   })
   def test_lto_libcxx(self, *args):
     self.run_process([EMXX, test_file('hello_libcxx.cpp'), '-flto'] + list(args))
@@ -8849,11 +8854,15 @@ def test_lto_flags(self):
 
   # We have LTO tests covered in 'wasmltoN' targets in test_core.py, but they
   # don't run as a part of Emscripten CI, so we add a separate LTO test here.
-  @requires_wasm_eh
   def test_lto_wasm_exceptions(self):
     self.set_setting('EXCEPTION_DEBUG')
+    self.require_wasm_eh()
     self.emcc_args += ['-fwasm-exceptions', '-flto']
     self.do_run_in_out_file_test('core/test_exceptions.cpp', out_suffix='_caught')
+    # New Wasm EH with exnref
+    self.require_wasm_exnref()
+    self.set_setting('WASM_EXNREF')
+    self.do_run_in_out_file_test('core/test_exceptions.cpp', out_suffix='_caught')
 
   @parameterized({
     '': ([],),
@@ -12269,12 +12278,16 @@ def test_standalone_export_main(self):
     # We should consider making this a warning since the `_main` export is redundant.
     self.run_process([EMCC, '-sEXPORTED_FUNCTIONS=_main', '-sSTANDALONE_WASM', test_file('core/test_hello_world.c')])
 
-  @requires_wasm_eh
   def test_standalone_wasm_exceptions(self):
     self.set_setting('STANDALONE_WASM')
     self.set_setting('WASM_BIGINT')
     self.wasm_engines = []
     self.emcc_args += ['-fwasm-exceptions']
+    self.require_wasm_eh()
+    self.do_run_in_out_file_test('core/test_exceptions.cpp', out_suffix='_caught')
+    # New Wasm EH with exnref
+    self.require_wasm_exnref()
+    self.set_setting('WASM_EXNREF')
     self.do_run_in_out_file_test('core/test_exceptions.cpp', out_suffix='_caught')
 
   def test_missing_malloc_export(self):