emscripten-core · sbc100 · Dec 3, 2022 · Dec 1, 2022
diff --git a/emcc.py b/emcc.py
@@ -2621,7 +2621,6 @@ def check_memory_setting(setting):
      settings.USE_PTHREADS or \
      settings.OFFSCREENCANVAS_SUPPORT or \
      settings.LEGACY_GL_EMULATION or \
-     not settings.DISABLE_EXCEPTION_CATCHING or \
      settings.ASYNCIFY or \
      settings.WASMFS or \
      settings.DEMANGLE_SUPPORT or \
@@ -2647,6 +2646,7 @@ def check_memory_setting(setting):
       # setThrew(). We cannot handle this using deps_info as the invokes are not
       # emitted because of library function usage, but by codegen itself.
       'setThrew',
+      '__cxa_free_exception',
     ]
 
   if settings.ASYNCIFY:

diff --git a/src/library_exceptions.js b/src/library_exceptions.js
@@ -163,29 +163,6 @@ var LibraryExceptions = {
     }
   },
 
-  // Exceptions
-  __cxa_allocate_exception__sig: 'pp',
-  __cxa_allocate_exception: function(size) {
-    // Thrown object is prepended by exception metadata block
-    return _malloc(size + {{{ C_STRUCTS.__cxa_exception.__size__ }}}) + {{{ C_STRUCTS.__cxa_exception.__size__ }}};
-  },
-
-  __cxa_free_exception__deps: ['$ExceptionInfo'],
-  __cxa_free_exception__sig: 'vp',
-  __cxa_free_exception: function(ptr) {
-#if ABORTING_MALLOC || ASSERTIONS
-    try {
-#endif
-      return _free(new ExceptionInfo(ptr).ptr);
-#if ABORTING_MALLOC || ASSERTIONS
-    } catch(e) {
-#if ASSERTIONS
-      err('exception during __cxa_free_exception: ' + e);
-#endif
-    }
-#endif
-  },
-
   __cxa_increment_exception_refcount__deps: ['$exception_addRef', '$ExceptionInfo'],
   __cxa_increment_exception_refcount__sig: 'vp',
   __cxa_increment_exception_refcount: function(ptr) {

diff --git a/system/lib/libcxxabi/src/cxa_exception_emscripten.cpp b/system/lib/libcxxabi/src/cxa_exception_emscripten.cpp
@@ -32,9 +32,6 @@ __gxx_personality_v0(int version,
 }
 #endif // !defined(__USING_WASM_EXCEPTIONS__)
 
-#if defined(__USING_EMSCRIPTEN_EXCEPTIONS__) ||                                \
-  defined(__USING_WASM_EXCEPTIONS__)
-
 using namespace __cxxabiv1;
 
 //  Some utility routines are copied from cxa_exception.cpp
@@ -50,6 +47,9 @@ thrown_object_from_cxa_exception(__cxa_exception* exception_header) {
   return static_cast<void*>(exception_header + 1);
 }
 
+#if defined(__USING_EMSCRIPTEN_EXCEPTIONS__) ||                                \
+  defined(__USING_WASM_EXCEPTIONS__)
+
 //  Get the exception object from the unwind pointer.
 //  Relies on the structure layout, where the unwind pointer is right in
 //  front of the user's exception object
@@ -130,3 +130,21 @@ char* __get_exception_terminate_message(void* thrown_object) {
 }
 
 #endif // __USING_EMSCRIPTEN_EXCEPTIONS__ || __USING_WASM_EXCEPTIONS__
+
+#ifndef __USING_WASM_EXCEPTIONS__
+
+namespace __cxxabiv1 {
+
+void* __cxa_allocate_exception(size_t size) _NOEXCEPT {
+  // Thrown object is prepended by exception metadata block
+  __cxa_exception* ex = (__cxa_exception*)malloc(size + sizeof(__cxa_exception));
+  return thrown_object_from_cxa_exception(ex);
+}
+
+void __cxa_free_exception(void *thrown_object) _NOEXCEPT {
+  free(cxa_exception_from_thrown_object(thrown_object));
+}
+
+}
+
+#endif // !__USING_WASM_EXCEPTIONS__
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.exports b/test/other/metadce/test_metadce_cxx_ctors1.exports
@@ -8,7 +8,6 @@ dynCall_iiiiijj
 dynCall_jiji
 dynCall_viijii
 main
-malloc
 memory
 stackAlloc
 stackRestore

diff --git a/test/other/metadce/test_metadce_cxx_ctors1.imports b/test/other/metadce/test_metadce_cxx_ctors1.imports
@@ -1,4 +1,3 @@
-env.__cxa_allocate_exception
 env.__cxa_throw
 env.abort
 env.emscripten_memcpy_big

diff --git a/test/other/metadce/test_metadce_cxx_ctors1.jssize b/test/other/metadce/test_metadce_cxx_ctors1.jssize
@@ -1 +1 @@
-26638
+26496
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.sent b/test/other/metadce/test_metadce_cxx_ctors1.sent
@@ -1,4 +1,3 @@
-__cxa_allocate_exception
 __cxa_throw
 abort
 emscripten_memcpy_big

diff --git a/test/other/metadce/test_metadce_cxx_ctors1.size b/test/other/metadce/test_metadce_cxx_ctors1.size
@@ -1 +1 @@
-123215
+123176
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.exports b/test/other/metadce/test_metadce_cxx_ctors2.exports
@@ -7,7 +7,6 @@ dynCall_iiiiijj
 dynCall_jiji
 dynCall_viijii
 main
-malloc
 memory
 stackAlloc
 stackRestore

diff --git a/test/other/metadce/test_metadce_cxx_ctors2.imports b/test/other/metadce/test_metadce_cxx_ctors2.imports
@@ -1,4 +1,3 @@
-env.__cxa_allocate_exception
 env.__cxa_throw
 env.abort
 env.emscripten_memcpy_big

diff --git a/test/other/metadce/test_metadce_cxx_ctors2.jssize b/test/other/metadce/test_metadce_cxx_ctors2.jssize
@@ -1 +1 @@
-26602
+26460
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.sent b/test/other/metadce/test_metadce_cxx_ctors2.sent
@@ -1,4 +1,3 @@
-__cxa_allocate_exception
 __cxa_throw
 abort
 emscripten_memcpy_big

diff --git a/test/other/metadce/test_metadce_cxx_ctors2.size b/test/other/metadce/test_metadce_cxx_ctors2.size
@@ -1 +1 @@
-123129
+123082
diff --git a/test/other/metadce/test_metadce_cxx_except.exports b/test/other/metadce/test_metadce_cxx_except.exports
@@ -1,4 +1,5 @@
 __cxa_can_catch
+__cxa_free_exception
 __cxa_is_pointer_type
 __errno_location
 __indirect_function_table
@@ -9,10 +10,8 @@ dynCall_iiiiijj
 dynCall_jiiii
 dynCall_jiji
 dynCall_viijii
-free
 getTempRet0
 main
-malloc
 memory
 setTempRet0
 setThrew

diff --git a/test/other/metadce/test_metadce_cxx_except.imports b/test/other/metadce/test_metadce_cxx_except.imports
@@ -1,9 +1,7 @@
-env.__cxa_allocate_exception
 env.__cxa_begin_catch
 env.__cxa_end_catch
 env.__cxa_find_matching_catch_2
 env.__cxa_find_matching_catch_3
-env.__cxa_free_exception
 env.__cxa_rethrow
 env.__cxa_throw
 env.__cxa_uncaught_exceptions

diff --git a/test/other/metadce/test_metadce_cxx_except.jssize b/test/other/metadce/test_metadce_cxx_except.jssize
@@ -1 +1 @@
-31469
+31300
diff --git a/test/other/metadce/test_metadce_cxx_except.sent b/test/other/metadce/test_metadce_cxx_except.sent
@@ -1,9 +1,7 @@
-__cxa_allocate_exception
 __cxa_begin_catch
 __cxa_end_catch
 __cxa_find_matching_catch_2
 __cxa_find_matching_catch_3
-__cxa_free_exception
 __cxa_rethrow
 __cxa_throw
 __cxa_uncaught_exceptions

diff --git a/test/other/metadce/test_metadce_cxx_except.size b/test/other/metadce/test_metadce_cxx_except.size
@@ -1 +1 @@
-164691
+164662
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.exports b/test/other/metadce/test_metadce_cxx_except_wasm.exports
@@ -7,11 +7,8 @@ dynCall_iiiiij
 dynCall_iiiiijj
 dynCall_jiji
 dynCall_viijii
-free
 main
-malloc
 memory
-setThrew
 stackAlloc
 stackRestore
 stackSave
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.jssize b/test/other/metadce/test_metadce_cxx_except_wasm.jssize
@@ -1 +1 @@
-26200
+25974
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.size b/test/other/metadce/test_metadce_cxx_except_wasm.size
@@ -1 +1 @@
-136628
+136567
diff --git a/test/other/metadce/test_metadce_cxx_mangle.exports b/test/other/metadce/test_metadce_cxx_mangle.exports
@@ -1,5 +1,6 @@
 __cxa_can_catch
 __cxa_demangle
+__cxa_free_exception
 __cxa_is_pointer_type
 __errno_location
 __indirect_function_table

diff --git a/test/other/metadce/test_metadce_cxx_mangle.imports b/test/other/metadce/test_metadce_cxx_mangle.imports
@@ -1,9 +1,7 @@
-env.__cxa_allocate_exception
 env.__cxa_begin_catch
 env.__cxa_end_catch
 env.__cxa_find_matching_catch_2
 env.__cxa_find_matching_catch_3
-env.__cxa_free_exception
 env.__cxa_rethrow
 env.__cxa_throw
 env.__cxa_uncaught_exceptions

diff --git a/test/other/metadce/test_metadce_cxx_mangle.jssize b/test/other/metadce/test_metadce_cxx_mangle.jssize
@@ -1 +1 @@
-31568
+31544
diff --git a/test/other/metadce/test_metadce_cxx_mangle.sent b/test/other/metadce/test_metadce_cxx_mangle.sent
@@ -1,9 +1,7 @@
-__cxa_allocate_exception
 __cxa_begin_catch
 __cxa_end_catch
 __cxa_find_matching_catch_2
 __cxa_find_matching_catch_3
-__cxa_free_exception
 __cxa_rethrow
 __cxa_throw
 __cxa_uncaught_exceptions

diff --git a/test/other/metadce/test_metadce_cxx_mangle.size b/test/other/metadce/test_metadce_cxx_mangle.size
@@ -1 +1 @@
-219853
+219840
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.exports b/test/other/metadce/test_metadce_cxx_noexcept.exports
@@ -8,7 +8,6 @@ dynCall_iiiiijj
 dynCall_jiji
 dynCall_viijii
 main
-malloc
 memory
 stackAlloc
 stackRestore

diff --git a/test/other/metadce/test_metadce_cxx_noexcept.imports b/test/other/metadce/test_metadce_cxx_noexcept.imports
@@ -1,4 +1,3 @@
-env.__cxa_allocate_exception
 env.__cxa_throw
 env.abort
 env.emscripten_memcpy_big

diff --git a/test/other/metadce/test_metadce_cxx_noexcept.jssize b/test/other/metadce/test_metadce_cxx_noexcept.jssize
@@ -1 +1 @@
-26638
+26496
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.sent b/test/other/metadce/test_metadce_cxx_noexcept.sent
@@ -1,4 +1,3 @@
-__cxa_allocate_exception
 __cxa_throw
 abort
 emscripten_memcpy_big

diff --git a/test/other/metadce/test_metadce_cxx_noexcept.size b/test/other/metadce/test_metadce_cxx_noexcept.size
@@ -1 +1 @@
-125959
+125909
diff --git a/test/test_core.py b/test/test_core.py
@@ -1454,7 +1454,10 @@ def test_exceptions_allowed(self):
     if '-fsanitize=leak' not in self.emcc_args:
       self.assertGreater(size - empty_size, 0.01 * size)
     # full disable can remove a little bit more
-    self.assertLess(disabled_size, fake_size)
+    # For some reason this no longer holds true at high optimizations
+    # levels: https://github.com/emscripten-core/emscripten/issues/18312
+    if not any(o in self.emcc_args for o in ('-O3', '-Oz', '-Os')):
+      self.assertLess(disabled_size, fake_size)
 
   @no_wasm64('MEMORY64 does not yet support exceptions')
   def test_exceptions_allowed_2(self):
@@ -1649,7 +1652,7 @@ def test_EXPORT_EXCEPTION_HANDLING_HELPERS(self):
       self.emcc_args.append('-D__USING_EMSCRIPTEN_EXCEPTION__')
 
     self.maybe_closure()
-    src = '''
+    create_file('main.cpp', '''
       #include <emscripten.h>
       #include <exception>
       #include <stdexcept>
@@ -1702,7 +1705,7 @@ class myexception : public exception {
             }
           });
       }
-    '''
+    ''')
     expected = '''\
 int,
 char,
@@ -1711,7 +1714,7 @@ class myexception : public exception {
 char const*,
 '''
 
-    self.do_run(src, expected)
+    self.do_runf('main.cpp', expected)
 
   @with_both_eh_sjlj
   def test_bad_typeid(self):
@@ -4700,8 +4703,8 @@ def test_dylink_postsets_chunking(self):
   @parameterized({
     'libcxx': ('libc,libc++,libmalloc,libc++abi',),
     'all': ('1',),
-    'missing': ('libc,libmalloc', False, False, False),
-    'missing_assertions': ('libc,libmalloc', False, False, True),
+    'missing': ('libc,libmalloc,libc++abi', False, False, False),
+    'missing_assertions': ('libc,libmalloc,libc++abi', False, False, True),
   })
   def test_dylink_syslibs(self, syslibs, expect_pass=True, need_reverse=True, assertions=True):
     # one module uses libcxx, need to force its inclusion when it isn't the main

diff --git a/tools/deps_info.py b/tools/deps_info.py
@@ -61,9 +61,6 @@
   'SDL_PushEvent': ['malloc', 'free'],
   'SDL_free': ['free'],
   'SDL_malloc': ['malloc', 'free'],
-  '__cxa_allocate_exception': ['malloc'],
-  '__cxa_end_catch': ['setThrew', 'free'],
-  '__cxa_free_exception': ['free'],
   '_embind_register_class': ['free'],
   '_embind_register_enum_value': ['free'],
   '_embind_register_function': ['free'],
@@ -194,7 +191,7 @@
 
 def get_deps_info():
   if not settings.WASM_EXCEPTIONS and settings.LINK_AS_CXX:
-    _deps_info['__cxa_begin_catch'] = ['__cxa_is_pointer_type']
+    _deps_info['__cxa_begin_catch'] = ['__cxa_is_pointer_type', '__cxa_free_exception']
     _deps_info['__cxa_throw'] = ['__cxa_is_pointer_type']
     _deps_info['__cxa_find_matching_catch'] = ['__cxa_can_catch', 'setTempRet0']
     _deps_info['__cxa_find_matching_catch_1'] = ['__cxa_can_catch', 'setTempRet0']