[cfe-commits] [libcxxabi] r152325 - in /libcxxabi/trunk: lib/buildit src/cxa_handlers.cpp

[Howard Hinnant]

Author: hhinnant
Date: Thu Mar  8 13:34:58 2012
New Revision: 152325

URL: http://llvm.org/viewvc/llvm-project?rev=152325&view=rev
Log:
Enable/silence -Wshadow.

Modified:
    libcxxabi/trunk/lib/buildit
    libcxxabi/trunk/src/cxa_handlers.cpp

Modified: libcxxabi/trunk/lib/buildit
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/lib/buildit?rev=152325&r1=152324&r2=152325&view=diff
==============================================================================
--- libcxxabi/trunk/lib/buildit (original)
+++ libcxxabi/trunk/lib/buildit Thu Mar  8 13:34:58 2012
@@ -28,7 +28,7 @@
 fi
 
 EXTRA_FLAGS="-std=c++0x -stdlib=libc++ -fstrict-aliasing -Wstrict-aliasing=2 \
-             -Wsign-conversion -Wnewline-eof"
+             -Wsign-conversion -Wshadow -Wnewline-eof"
 
 case $TRIPLE in
   *-apple-*)

Modified: libcxxabi/trunk/src/cxa_handlers.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/cxa_handlers.cpp?rev=152325&r1=152324&r2=152325&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_handlers.cpp (original)
+++ libcxxabi/trunk/src/cxa_handlers.cpp Thu Mar  8 13:34:58 2012
@@ -177,10 +177,7 @@
                 (unwind_exception->exception_class & get_vendor_and_language) ==
                                (kOurExceptionClass & get_vendor_and_language);
             if (native_exception)
-            {
-                __cxa_exception* exception_header = (__cxa_exception*)(unwind_exception+1) - 1;
                 __terminate(exception_header->terminateHandler);
-            }
         }
     }
     __terminate(get_terminate());