Skip to content

Commit

Permalink
libcxxrt: Add a stub implementation of __cxa_call_terminate
Browse files Browse the repository at this point in the history
This function is called by GCC 14 if a destructor invoked during
exception unwinding throws an exception.

Reviewed by:	emaste
Obtained from:	libcxxrt commit 391a3dcc1054e18c2f0dff4e14d6d79ac95399d7
Differential Revision:	https://reviews.freebsd.org/D46004
  • Loading branch information
bsdjhb committed Aug 21, 2024
1 parent 47656cc commit 297a9e5
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
13 changes: 13 additions & 0 deletions contrib/libcxxrt/exception.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,19 @@ extern "C" void __cxa_call_unexpected(void*exception)
abort();
}

/**
* ABI function, called when an object destructor exits due to an
* exception during stack unwinding.
*
* This function does not return.
*/
extern "C" void __cxa_call_terminate(void *exception) throw()
{
std::terminate();
// Should not be reached.
abort();
}

/**
* ABI function, returns the adjusted pointer to the exception object.
*/
Expand Down
4 changes: 4 additions & 0 deletions lib/libcxxrt/Version.map
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,10 @@ CXXABI_1.3.11 {
__cxa_init_primary_exception;
} CXXABI_1.3.9;

CXXABI_1.3.15 {
__cxa_call_terminate;
} CXXABI_1.3.11;

CXXRT_1.0 {

extern "C++" {
Expand Down
4 changes: 4 additions & 0 deletions lib/libcxxrt/Version.map.arm
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,10 @@ CXXABI_1.3.11 {
__cxa_init_primary_exception;
} CXXABI_1.3.9;

CXXABI_1.3.15 {
__cxa_call_terminate;
} CXXABI_1.3.11;

CXXRT_1.0 {

extern "C++" {
Expand Down

0 comments on commit 297a9e5

Please sign in to comment.