diff options
| author | theraven <theraven@FreeBSD.org> | 2013-01-21 17:37:23 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2013-01-21 17:37:23 +0000 |
| commit | 69580a6939c66fe82a84d9ff067d1c3bbee5991f (patch) | |
| tree | e4d6b9fdfcf027d41daf614b4debb061d5daf84b | |
| parent | e0b8f4e7a3196af27595bf087a84f0530617f0b1 (diff) | |
| download | FreeBSD-src-69580a6939c66fe82a84d9ff067d1c3bbee5991f.zip FreeBSD-src-69580a6939c66fe82a84d9ff067d1c3bbee5991f.tar.gz | |
Import new fix from libcxxrt. This fixes the case where you attempt to rethrow
an exception when you haven't caught one. This is largely a cosmetic fix, as
(unless you have a very unusual terminate handler installed) it will print a
nice error and then abort, rather than just aborting.
MFC after: 7 days
| -rw-r--r-- | contrib/libcxxrt/exception.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc index 0cb2535..4ccf38e 100644 --- a/contrib/libcxxrt/exception.cc +++ b/contrib/libcxxrt/exception.cc @@ -801,7 +801,7 @@ extern "C" void __cxa_decrement_exception_refcount(void* thrown_exception) */ extern "C" void __cxa_rethrow() { - __cxa_thread_info *ti = thread_info_fast(); + __cxa_thread_info *ti = thread_info(); __cxa_eh_globals *globals = &ti->globals; // Note: We don't remove this from the caught list here, because // __cxa_end_catch will be called when we unwind out of the try block. We |
