diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-01-30 16:07:00 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-01-30 16:07:00 +0000 |
| commit | 47cb854818ed51d591f58552c6e681a2ad372bf8 (patch) | |
| tree | ab46572dd15b0ed25ba7ba60bed03f0028e8c340 /libcxxabi/src/cxa_exception.hpp | |
| parent | 3f0d2384aa802af867541a6cf9ce29cc77be0019 (diff) | |
| download | bcm5719-llvm-47cb854818ed51d591f58552c6e681a2ad372bf8.tar.gz bcm5719-llvm-47cb854818ed51d591f58552c6e681a2ad372bf8.zip | |
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
Diffstat (limited to 'libcxxabi/src/cxa_exception.hpp')
| -rw-r--r-- | libcxxabi/src/cxa_exception.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
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 |
