Changed my mind about __cxa_uncaught_exception and added it.

llvm-svn: 148754

1 files changed, 9 insertions, 0 deletions

diff --git a/libcxxabi/src/cxa_exception.cpp b/libcxxabi/src/cxa_exception.cpp
index 96868f5aff2..ba4f84dbdc6 100644
--- a/libcxxabi/src/cxa_exception.cpp
+++ b/libcxxabi/src/cxa_exception.cpp
@@ -505,6 +505,15 @@ __cxa_rethrow_primary_exception(void* thrown_object)
     // If we return client will call terminate()
 }
 
+bool
+__cxa_uncaught_exception() throw()
+{
+    __cxa_eh_globals* globals = __cxa_get_globals_fast();
+    if (globals == 0)
+        return false;
+    return globals->uncaughtExceptions != 0;
+}
+
 }  // extern "C"
 
 }  // abi