Implement uncaught_exceptions() to get a count, rather than a bool. Update the libc++abi version. Reviewed as http://reviews.llvm.org/D10067

llvm-svn: 238827

1 files changed, 36 insertions, 0 deletions

diff --git a/libcxxabi/test/uncaught_exceptions.pass.cpp b/libcxxabi/test/uncaught_exceptions.pass.cpp
new file mode 100644
index 00000000000..fd4b8f41646
--- /dev/null
+++ b/libcxxabi/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) {}
+}