Implement uncaught_exceptions() to get a count, rather than a bool. Update the libc++abi version. Reviewed as http://reviews.llvm.org/D10067
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@238827 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/cxxabi.h b/include/cxxabi.h
index 767acfe..f29253c 100644
--- a/include/cxxabi.h
+++ b/include/cxxabi.h
@@ -20,7 +20,7 @@
#include <__cxxabi_config.h>
-#define _LIBCPPABI_VERSION 1001
+#define _LIBCPPABI_VERSION 1002
#define LIBCXXABI_NORETURN __attribute__((noreturn))
#ifdef __cplusplus
@@ -161,8 +161,9 @@
extern void __cxa_increment_exception_refcount(void* primary_exception) throw();
extern void __cxa_decrement_exception_refcount(void* primary_exception) throw();
-// Apple addition to support std::uncaught_exception()
-extern bool __cxa_uncaught_exception() throw();
+// Apple extension to support std::uncaught_exception()
+extern bool __cxa_uncaught_exception () throw();
+extern unsigned int __cxa_uncaught_exceptions() throw();
#ifdef __linux__
// Linux TLS support. Not yet an official part of the Itanium ABI.
diff --git a/src/cxa_exception.cpp b/src/cxa_exception.cpp
index b7a33d7..ae2b39c 100644
--- a/src/cxa_exception.cpp
+++ b/src/cxa_exception.cpp
@@ -710,13 +710,16 @@
}
bool
-__cxa_uncaught_exception() throw()
+__cxa_uncaught_exception() throw() { return __cxa_uncaught_exceptions() != 0; }
+
+unsigned int
+__cxa_uncaught_exceptions() throw()
{
// This does not report foreign exceptions in flight
__cxa_eh_globals* globals = __cxa_get_globals_fast();
if (globals == 0)
- return false;
- return globals->uncaughtExceptions != 0;
+ return 0;
+ return globals->uncaughtExceptions;
}
} // extern "C"
diff --git a/test/uncaught_exceptions.pass.cpp b/test/uncaught_exceptions.pass.cpp
new file mode 100644
index 0000000..fd4b8f4
--- /dev/null
+++ b/test/uncaught_exceptions.pass.cpp
@@ -0,0 +1,36 @@
+//===------------------- uncaught_exceptions.pass.cpp ---------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <cxxabi.h>
+#include <exception>
+#include <cassert>
+
+// namespace __cxxabiv1 {
+// extern bool __cxa_uncaught_exception () throw();
+// extern unsigned int __cxa_uncaught_exceptions() throw();
+// }
+
+struct A {
+ ~A() { assert( __cxxabiv1::__cxa_uncaught_exception()); }
+ };
+
+struct B {
+ B(int cnt) : data_(cnt) {}
+ ~B() { assert( data_ == __cxxabiv1::__cxa_uncaught_exceptions()); }
+ int data_;
+ };
+
+int main ()
+{
+ try { A a; throw 3; assert (false); }
+ catch (int) {}
+
+ try { B b(1); throw 3; assert (false); }
+ catch (int) {}
+}
