From 47cb854818ed51d591f58552c6e681a2ad372bf8 Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Mon, 30 Jan 2012 16:07:00 +0000 Subject: Add a descriptive name for a constant. Also I'm at least temporarily waging war on throw specs, both old and new style. Except where we have already publicly exposed the throw spec, I'm getting rid of them. They may come back later. But they seem somewhat prone to cyclic dependencies here. The throw spec implies compiler generated code that this library has to jump to during stack unwinding. I'd like to minimize the possiblity that the code used to properly make that jump is itself creating such jumps. llvm-svn: 149251 --- libcxxabi/src/cxa_exception.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libcxxabi/src/cxa_exception.hpp') diff --git a/libcxxabi/src/cxa_exception.hpp b/libcxxabi/src/cxa_exception.hpp index 9cb5506a6f3..7f392156d03 100644 --- a/libcxxabi/src/cxa_exception.hpp +++ b/libcxxabi/src/cxa_exception.hpp @@ -19,6 +19,7 @@ namespace __cxxabiv1 { static const uint64_t kOurExceptionClass = 0x434C4E47432B2B00; // CLNGC++\0 static const uint64_t kOurDependentExceptionClass = 0x434C4E47432B2B01; // CLNGC++\1 +static const uint64_t get_language = 0x00000000FFFFFF00; // mask for C++ struct __cxa_exception { #if __LP64__ @@ -102,10 +103,10 @@ static const uint64_t kOurDependentExceptionClass = 0x434C4E47432B2B01; // CLNGC #endif }; - extern "C" __cxa_eh_globals * __cxa_get_globals () noexcept; - extern "C" __cxa_eh_globals * __cxa_get_globals_fast () noexcept; + extern "C" __cxa_eh_globals * __cxa_get_globals (); + extern "C" __cxa_eh_globals * __cxa_get_globals_fast (); - extern "C" void * __cxa_allocate_dependent_exception () noexcept; - extern "C" void __cxa_free_dependent_exception (void * dependent_exception) noexcept; + extern "C" void * __cxa_allocate_dependent_exception (); + extern "C" void __cxa_free_dependent_exception (void * dependent_exception); } \ No newline at end of file -- cgit v1.2.3