Skip to content
13 changes: 13 additions & 0 deletions system/lib/libcxxabi/src/cxa_exception_emscripten.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,23 @@
#include "cxa_exception.h"
#include "private_typeinfo.h"
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>

#if defined(__USING_EMSCRIPTEN_EXCEPTIONS__) || \
defined(__USING_WASM_EXCEPTIONS__)

// TODO: Remove this when Rust doesn't need it anymore.
// https://github.com/rust-lang/rust/pull/97888
extern "C" _LIBCXXABI_FUNC_VIS _Unwind_Reason_Code
__gxx_personality_v0(int version,
_Unwind_Action actions,
uint64_t exceptionClass,
_Unwind_Exception* unwind_exception,
_Unwind_Context* context) {
abort();
}

using namespace __cxxabiv1;

// Some utility routines are copied from cxa_exception.cpp
Expand Down
24 changes: 24 additions & 0 deletions tests/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -12155,3 +12155,27 @@ def test_print_map(self):
self.assertContained('hello_world.o:(__original_main)', out)
out2 = self.run_process([EMCC, 'hello_world.o', '-Wl,-M'], stdout=PIPE).stdout
self.assertEqual(out, out2)

def test_rust_gxx_personality_v0(self):
create_file('main.cpp', r'''
#include <stdio.h>
#include <stdint.h>
extern "C" {
int __gxx_personality_v0(int version, void* actions, uint64_t exception_class, void* exception_object, void* context);
int main() {
__gxx_personality_v0(0, NULL, 0, NULL, NULL);
return 0;
}
}
''')
self.run_process([EMXX, '-c', 'main.cpp', '-fexceptions'])

self.run_process([EMXX, '-o', 'main.js', 'main.o', '-fexceptions'] + self.get_emcc_args())

try:
self.do_run('main.js', no_build=True)
raise RuntimeError('should not have passed')
except AssertionError as e:
err = e
assert "Aborted(native code called abort())" in err.args[0]
del err
1 change: 1 addition & 0 deletions tools/system_libs.py
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,7 @@ def get_files(self):
'private_typeinfo.cpp',
'cxa_exception_emscripten.cpp',
]
print("HI!")
if self.eh_mode == Exceptions.NONE:
filenames += ['cxa_noexception.cpp']
elif self.eh_mode == Exceptions.WASM:
Expand Down