Skip to content

Add back in __gxx_personality_v0 #17222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jun 16, 2022
19 changes: 19 additions & 0 deletions system/lib/libcxxabi/src/cxa_exception_emscripten.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,25 @@
#include "cxa_exception.h"
#include "private_typeinfo.h"
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>

#if !defined(__USING_WASM_EXCEPTIONS__)
// Until recently, Rust's `rust_eh_personality` for emscripten referred to this
// symbol. If Emscripten doesn't provide it, there will be errors when linking
// rust. The rust personality function is never called so we can just abort.
// We need this to support old versions of Rust.
// https://github.com/rust-lang/rust/pull/97888
// TODO: Remove this when Rust doesn't need it anymore.
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();
}
#endif // !defined(__USING_WASM_EXCEPTIONS__)

#if defined(__USING_EMSCRIPTEN_EXCEPTIONS__) || \
defined(__USING_WASM_EXCEPTIONS__)
Expand Down
13 changes: 13 additions & 0 deletions tests/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -12155,3 +12155,16 @@ 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):
self.do_run(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;
}
}
''', assert_returncode=NON_ZERO)