[cfe-commits] [libcxxabi] r147760 - /libcxxabi/trunk/src/cxa_exception.cpp

[Howard Hinnant]

Author: hhinnant
Date: Sun Jan  8 17:40:41 2012
New Revision: 147760

URL: http://llvm.org/viewvc/llvm-project?rev=147760&view=rev
Log:
Add a few TODO's and FIXME's.  Making notes as I go along, but not slowing down to fix these yet.  Just don't want anything to fall through the cracks.

Modified:
    libcxxabi/trunk/src/cxa_exception.cpp

Modified: libcxxabi/trunk/src/cxa_exception.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/cxa_exception.cpp?rev=147760&r1=147759&r2=147760&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_exception.cpp (original)
+++ libcxxabi/trunk/src/cxa_exception.cpp Sun Jan  8 17:40:41 2012
@@ -214,6 +214,7 @@
 
 // 2.5.3 Exception Handlers
 extern void * __cxa_get_exception_ptr(void * exceptionObject) throw() {
+//    TODO:  This must return the *adjusted* pointer to the exception object.
     return exception_from_exception_object(exceptionObject);
 }
     
@@ -243,7 +244,7 @@
     }
         
     globals->uncaughtExceptions -= 1;   // Not atomically, since globals are thread-local
-    return thrown_object_from_exception(exception);
+    return __cxa_get_exception_ptr(exceptionObject);
 }
 
 
@@ -295,6 +296,8 @@
 
 
 std::type_info * __cxa_current_exception_type() {
+// FIXME:  I don't think we need to drill down into __cxa_dependent_exception
+//         because the exceptionType is replicated in the __cxa_dependent_exception
 //  get the current exception
     __cxa_eh_globals *globals = __cxa_get_globals_fast();
     if (NULL == globals)