Commit a8a754aa authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook GitHub Bot

rename the redefined __cxa_exception

Summary: In case some `<cxxabi.h>` actually defines it rather than keeping it defined in some unincluded helper.

Reviewed By: luciang

Differential Revision: D28239978

fbshipit-source-id: 4d824892966de4b9f8de775d947f5d7d749a02bb
parent 7605607e
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
namespace __cxxabiv1 { namespace __cxxabiv1 {
struct __cxa_exception { struct __folly_cxa_exception {
#if defined(__LP64__) || defined(_WIN64) || defined(_LIBCXXABI_ARM_EHABI) #if defined(__LP64__) || defined(_WIN64) || defined(_LIBCXXABI_ARM_EHABI)
void* reserve; void* reserve;
size_t referenceCount; size_t referenceCount;
...@@ -59,10 +59,10 @@ struct __cxa_exception { ...@@ -59,10 +59,10 @@ struct __cxa_exception {
void (*exceptionDestructor)(void*); void (*exceptionDestructor)(void*);
void (*unexpectedHandler)(); void (*unexpectedHandler)();
std::terminate_handler terminateHandler; std::terminate_handler terminateHandler;
__cxa_exception* nextException; __folly_cxa_exception* nextException;
int handlerCount; int handlerCount;
#if defined(_LIBCXXABI_ARM_EHABI) #if defined(_LIBCXXABI_ARM_EHABI)
__cxa_exception* nextPropagatingException; __folly_cxa_exception* nextPropagatingException;
int propagationCount; int propagationCount;
#else #else
int handlerSwitchValue; int handlerSwitchValue;
...@@ -147,7 +147,7 @@ std::type_info const* exception_ptr_get_type( ...@@ -147,7 +147,7 @@ std::type_info const* exception_ptr_get_type(
return nullptr; return nullptr;
} }
auto object = cxxabi_get_object(ptr); auto object = cxxabi_get_object(ptr);
auto exception = static_cast<abi::__cxa_exception*>(object) - 1; auto exception = static_cast<abi::__folly_cxa_exception*>(object) - 1;
return exception->exceptionType; return exception->exceptionType;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment