summaryrefslogtreecommitdiffstats
path: root/libcxxabi/src/cxa_exception.cpp
diff options
context:
space:
mode:
authorMarshall Clow <mclow@qualcomm.com>2012-01-03 23:26:09 +0000
committerMarshall Clow <mclow@qualcomm.com>2012-01-03 23:26:09 +0000
commitf83663a9cd23ea9ef4670f89a130ed649585c34e (patch)
tree95487d679c82f4e209fa59e6630bf27fe4f68cfb /libcxxabi/src/cxa_exception.cpp
parentb9c71290123cf7d4be45d7456d9f1e02b3aa0ab5 (diff)
downloadbcm5719-llvm-f83663a9cd23ea9ef4670f89a130ed649585c34e.tar.gz
bcm5719-llvm-f83663a9cd23ea9ef4670f89a130ed649585c34e.zip
Don't allocate TLS storage when checking to see if an exception has been thrown - really
llvm-svn: 147497
Diffstat (limited to 'libcxxabi/src/cxa_exception.cpp')
-rw-r--r--libcxxabi/src/cxa_exception.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxxabi/src/cxa_exception.cpp b/libcxxabi/src/cxa_exception.cpp
index 1887c5afc3d..a011dd0f30d 100644
--- a/libcxxabi/src/cxa_exception.cpp
+++ b/libcxxabi/src/cxa_exception.cpp
@@ -386,7 +386,7 @@ void*
__cxa_current_primary_exception() throw()
{
// get the current exception
- __cxa_eh_globals* globals = __cxa_get_globals();
+ __cxa_eh_globals* globals = __cxa_get_globals_fast();
if (NULL == globals)
return NULL; // Never has been an exception
__cxa_exception* current_exception = globals->caughtExceptions;
OpenPOWER on IntegriCloud