summaryrefslogtreecommitdiffstats
path: root/contrib/libcxxrt/exception.cc
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2013-04-27 19:26:56 +0000
committerdim <dim@FreeBSD.org>2013-04-27 19:26:56 +0000
commit7b9fef1391980ba73dcc1c4ea9b36dcb7f6f7794 (patch)
tree574da279b6e15a5066f7a63afa9c67c6c0e12cc1 /contrib/libcxxrt/exception.cc
parent046db6cecd043a6833060897f100e549196cfceb (diff)
downloadFreeBSD-src-7b9fef1391980ba73dcc1c4ea9b36dcb7f6f7794.zip
FreeBSD-src-7b9fef1391980ba73dcc1c4ea9b36dcb7f6f7794.tar.gz
Merge libcxxrt c812a07cd2f95c1403baf0bbe0366e7618d1d6d3:
* Don't call the _fast version of the TLS accessor in terminate() or unexpected(). 1) TLS may not have been set up yet. 2) When we're in one of these functions, Really Bad Stuff has happened and potentially saving a few cycles really isn't important. * Merge in fixes from FreeBSD trunk to make atomics work with recent clang. MFC after: 1 week
Diffstat (limited to 'contrib/libcxxrt/exception.cc')
-rw-r--r--contrib/libcxxrt/exception.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc
index 7f0d3e8..50ee582 100644
--- a/contrib/libcxxrt/exception.cc
+++ b/contrib/libcxxrt/exception.cc
@@ -1404,7 +1404,7 @@ namespace std
*/
void terminate()
{
- static __cxa_thread_info *info = thread_info_fast();
+ static __cxa_thread_info *info = thread_info();
if (0 != info && 0 != info->terminateHandler)
{
info->terminateHandler();
@@ -1421,7 +1421,7 @@ namespace std
*/
void unexpected()
{
- static __cxa_thread_info *info = thread_info_fast();
+ static __cxa_thread_info *info = thread_info();
if (0 != info && 0 != info->unexpectedHandler)
{
info->unexpectedHandler();
OpenPOWER on IntegriCloud