diff options
| author | David Chisnall <theraven@FreeBSD.org> | 2013-01-21 17:37:23 +0000 |
|---|---|---|
| committer | David Chisnall <theraven@FreeBSD.org> | 2013-01-21 17:37:23 +0000 |
| commit | d5861eaae80e884425fa1080613368575c508e98 (patch) | |
| tree | e4d6b9fdfcf027d41daf614b4debb061d5daf84b /contrib | |
| parent | 4812dba4dc2f4c8f70a41a2afcca8b37f23ee0ee (diff) | |
| parent | a694e2e49638733fdcb3aeb649a074daf5410e8e (diff) | |
| download | src-d5861eaae80e884425fa1080613368575c508e98.tar.gz src-d5861eaae80e884425fa1080613368575c508e98.zip | |
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
Notes
Notes:
svn path=/head/; revision=245745
Diffstat (limited to 'contrib')
| -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 0cb2535f8fd1..4ccf38eba7ac 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 |