* Add proper support for rethrown exceptions.

* Make catch_begin() produce a pointer that must be passed to catch_end()
* Eliminate the caught exception stack.
* Add optional debugging code that may be turned on.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8184 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 4 insertions, 2 deletions

diff --git a/runtime/GCCLibraries/libexception/C++-Exception.h b/runtime/GCCLibraries/libexception/C++-Exception.h
index 2a16ad0531..56cc21ae25 100644
--- a/runtime/GCCLibraries/libexception/C++-Exception.h
+++ b/runtime/GCCLibraries/libexception/C++-Exception.h
@@ -55,7 +55,7 @@ inline llvm_cxx_exception *get_cxx_exception(llvm_exception *E) throw() {
 namespace __cxxabiv1 {
   // Invokes given handler, dying appropriately if the user handler was
   // so inconsiderate as to return.
-  extern void __terminate(std::terminate_handler) __attribute__((noreturn));
+  extern void __terminate(std::terminate_handler) throw() __attribute__((noreturn));
   extern void __unexpected(std::unexpected_handler) __attribute__((noreturn));
   
   // The current installed user handlers.
@@ -74,8 +74,10 @@ extern "C" {
     throw();
   void *__llvm_cxxeh_begin_catch() throw();
   void *__llvm_cxxeh_begin_catch_if_isa(void *CatchType) throw();
-  void __llvm_cxxeh_end_catch() /* might throw */;
+  void __llvm_cxxeh_end_catch(void *Exception) /* might throw */;
   void __llvm_cxxeh_rethrow() throw();
+  void *__llvm_cxxeh_get_last_caught() throw();
+
   void __llvm_cxxeh_check_eh_spec(void *Info, ...);
 }