[cfe-commits] [libcxxabi] r147497 - /libcxxabi/trunk/src/cxa_exception.cpp

[Marshall Clow]

Author: marshall
Date: Tue Jan  3 17:26:09 2012
New Revision: 147497

URL: http://llvm.org/viewvc/llvm-project?rev=147497&view=rev
Log:
Don't allocate TLS storage when checking to see if an exception has been thrown - really

Modified:
    libcxxabi/trunk/src/cxa_exception.cpp

Modified: libcxxabi/trunk/src/cxa_exception.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/cxa_exception.cpp?rev=147497&r1=147496&r2=147497&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_exception.cpp (original)
+++ libcxxabi/trunk/src/cxa_exception.cpp Tue Jan  3 17:26:09 2012
@@ -386,7 +386,7 @@
 __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;