[EH] Rename Wasm EH tests (emscripten-core#23427)

This renames Wasm EH test modes:
- `wasm` -> `wasm_legacy`
- `wasm_exnref` -> `wasm`

So `_wasm` suffix means the standardized Wasm EH, and `_wasm_legacy`
means the legacy EH. This also removes some comments mentioning things
like "new Wasm EH with exnref", given that this should be (eventually)
the default mode and not the new thing.

Author: aheejin

.circleci/config.yml

@@ -859,7 +859,7 @@ jobs:
             core2.test_i64_invoke_bigint
             core2.test_sse2
             core2.test_source_map
-            core2.test_exceptions_wasm
+            core2.test_exceptions_wasm_legacy
             core2.test_pthread_unhandledrejection"
       - upload-test-results
   test-other:

test/common.py

@@ -625,19 +625,19 @@ def metafunc(self, standalone):
   return decorated
 
 
-# Tests exception handling / setjmp/longjmp handling in Emscripten EH/SjLj mode
-# and new wasm EH/SjLj modes. This tests three combinations:
+# Tests exception handling and setjmp/longjmp handling. This tests three
+# combinations:
 # - Emscripten EH + Emscripten SjLj
-# - Wasm EH + Wasm SjLj (Phase 3, to be deprecated)
-# - Wasm EH + Wasm SjLj (New proposal witn exnref, experimental)
+# - Wasm EH + Wasm SjLj
+# - Wasm EH + Wasm SjLj (Legacy)
 def with_all_eh_sjlj(f):
   assert callable(f)
 
   @wraps(f)
   def metafunc(self, mode, *args, **kwargs):
     if DEBUG:
       print('parameterize:eh_mode=%s' % mode)
-    if mode in {'wasm', 'wasm_exnref'}:
+    if mode in {'wasm', 'wasm_legacy'}:
       # Wasm EH is currently supported only in wasm backend and V8
       if self.is_wasm2js():
         self.skipTest('wasm2js does not support wasm EH/SjLj')
@@ -647,9 +647,9 @@ def metafunc(self, mode, *args, **kwargs):
       self.emcc_args.append('-fwasm-exceptions')
       self.set_setting('SUPPORT_LONGJMP', 'wasm')
       if mode == 'wasm':
-        self.require_wasm_legacy_eh()
-      if mode == 'wasm_exnref':
         self.require_wasm_eh()
+      if mode == 'wasm_legacy':
+        self.require_wasm_legacy_eh()
       f(self, *args, **kwargs)
     else:
       self.set_setting('DISABLE_EXCEPTION_CATCHING', 0)
@@ -663,7 +663,7 @@ def metafunc(self, mode, *args, **kwargs):
 
   parameterize(metafunc, {'emscripten': ('emscripten',),
                           'wasm': ('wasm',),
-                          'wasm_exnref': ('wasm_exnref',)})
+                          'wasm_legacy': ('wasm_legacy',)})
   return metafunc
 
 
@@ -674,25 +674,25 @@ def with_all_sjlj(f):
 
   @wraps(f)
   def metafunc(self, mode, *args, **kwargs):
-    if mode in {'wasm', 'wasm_exnref'}:
+    if mode in {'wasm', 'wasm_legacy'}:
       if self.is_wasm2js():
         self.skipTest('wasm2js does not support wasm SjLj')
       # FIXME Temporarily disabled. Enable this later when the bug is fixed.
       if '-fsanitize=address' in self.emcc_args:
         self.skipTest('Wasm EH does not work with asan yet')
       self.set_setting('SUPPORT_LONGJMP', 'wasm')
       if mode == 'wasm':
-        self.require_wasm_legacy_eh()
-      if mode == 'wasm_exnref':
         self.require_wasm_eh()
+      if mode == 'wasm_legacy':
+        self.require_wasm_legacy_eh()
       f(self, *args, **kwargs)
     else:
       self.set_setting('SUPPORT_LONGJMP', 'emscripten')
       f(self, *args, **kwargs)
 
   parameterize(metafunc, {'emscripten': ('emscripten',),
                           'wasm': ('wasm',),
-                          'wasm_exnref': ('wasm_exnref',)})
+                          'wasm_legacy': ('wasm_legacy',)})
   return metafunc
 
 

test/other/codesize/test_codesize_cxx_except_wasm.size

@@ -1 +1 @@
-142162
+144708

test/other/codesize/test_codesize_cxx_except_wasm_exnref.size

@@ -0,0 +1 @@
+142162