From c9661eeaabe111ea052c2d3aa822fa157ce36d35 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 27 Aug 2003 04:50:45 +0000 Subject: [PATCH] C++ify, add new get_cxx_exception function to convert from generic llvm_exceptions to llvm_cxx_exception's llvm-svn: 8156 --- llvm/runtime/GCCLibraries/crtend/C++-Exception.h | 10 +++++++--- llvm/runtime/GCCLibraries/libexception/C++-Exception.h | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/llvm/runtime/GCCLibraries/crtend/C++-Exception.h b/llvm/runtime/GCCLibraries/crtend/C++-Exception.h index 9c5447b88a44..6ff384e84d07 100644 --- a/llvm/runtime/GCCLibraries/crtend/C++-Exception.h +++ b/llvm/runtime/GCCLibraries/crtend/C++-Exception.h @@ -10,8 +10,9 @@ #include "exception.h" #include +#include -typedef struct llvm_cxx_exception { +struct llvm_cxx_exception { /* TypeInfo - A pointer to the C++ std::type_info object for this exception * class. This is required because the class may not be polymorphic. */ @@ -42,9 +43,12 @@ typedef struct llvm_cxx_exception { * this structure without breaking binary compatibility. */ llvm_exception BaseException; -} llvm_cxx_exception; - +}; +inline llvm_cxx_exception *get_cxx_exception(llvm_exception *E) { + assert(E->ExceptionType == CXXException && "Not a C++ exception?"); + return (llvm_cxx_exception*)(E+1)-1; +} extern "C" { void *__llvm_cxxeh_allocate_exception(unsigned NumBytes); diff --git a/llvm/runtime/GCCLibraries/libexception/C++-Exception.h b/llvm/runtime/GCCLibraries/libexception/C++-Exception.h index 9c5447b88a44..6ff384e84d07 100644 --- a/llvm/runtime/GCCLibraries/libexception/C++-Exception.h +++ b/llvm/runtime/GCCLibraries/libexception/C++-Exception.h @@ -10,8 +10,9 @@ #include "exception.h" #include +#include -typedef struct llvm_cxx_exception { +struct llvm_cxx_exception { /* TypeInfo - A pointer to the C++ std::type_info object for this exception * class. This is required because the class may not be polymorphic. */ @@ -42,9 +43,12 @@ typedef struct llvm_cxx_exception { * this structure without breaking binary compatibility. */ llvm_exception BaseException; -} llvm_cxx_exception; - +}; +inline llvm_cxx_exception *get_cxx_exception(llvm_exception *E) { + assert(E->ExceptionType == CXXException && "Not a C++ exception?"); + return (llvm_cxx_exception*)(E+1)-1; +} extern "C" { void *__llvm_cxxeh_allocate_exception(unsigned NumBytes);