generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prepare for running on top of new libc++abi.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@149634 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant
2012-02-02 20:48:35 +00:00
parent b1bc0c4975
commit dea7f39af1
4 changed files with 234 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/exception.cpp
View File

@@ -12,14 +12,17 @@
#if __APPLE__
#include <cxxabi.h>
using namespace __cxxabiv1;
using namespace __cxxabiapple;
// On Darwin, there are two STL shared libraries and a lower level ABI
// shared libray. The globals holding the current terminate handler and
// current unexpected handler are in the ABI library.
#define __terminate_handler __cxxabiapple::__cxa_terminate_handler
#define __unexpected_handler __cxxabiapple::__cxa_unexpected_handler
#define HAVE_DEPENDENT_EH_ABI 1
#ifndef _LIBCPPABI_VERSION
using namespace __cxxabiapple;
// On Darwin, there are two STL shared libraries and a lower level ABI
// shared libray. The globals holding the current terminate handler and
// current unexpected handler are in the ABI library.
#define __terminate_handler __cxxabiapple::__cxa_terminate_handler
#define __unexpected_handler __cxxabiapple::__cxa_unexpected_handler
#endif // _LIBCPPABI_VERSION
#elif defined(LIBCXXRT)
#include <cxxabi.h>
using namespace __cxxabiv1;
@@ -29,7 +32,8 @@
static std::unexpected_handler __unexpected_handler;
#endif // __APPLE__
#ifndef LIBCXXRT
#if !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION)
// libcxxrt provides implementations of these functions itself.
std::unexpected_handler
std::set_unexpected(std::unexpected_handler func) _NOEXCEPT
@@ -84,13 +88,13 @@ std::terminate() _NOEXCEPT
}
#endif // _LIBCPP_NO_EXCEPTIONS
}
#endif // LIBCXXRT
#endif // !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION)
bool std::uncaught_exception() _NOEXCEPT
{
#if __APPLE__
// on Darwin, there is a helper function so __cxa_get_globals is private
return __cxxabiapple::__cxa_uncaught_exception();
return __cxa_uncaught_exception();
#elif LIBCXXRT
__cxa_eh_globals * globals = __cxa_get_globals();
return (globals->uncaughtExceptions != 0);
@@ -103,6 +107,8 @@ bool std::uncaught_exception() _NOEXCEPT
namespace std
{
#ifndef _LIBCPPABI_VERSION
exception::~exception() _NOEXCEPT
{
}
@@ -121,6 +127,8 @@ const char* bad_exception::what() const _NOEXCEPT
return "std::bad_exception";
}
#endif // _LIBCPPABI_VERSION
exception_ptr::~exception_ptr() _NOEXCEPT
{
#if HAVE_DEPENDENT_EH_ABI