diff options
| -rwxr-xr-x | libcxxabi/lib/buildit | 2 | ||||
| -rw-r--r-- | libcxxabi/src/cxa_handlers.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/libcxxabi/lib/buildit b/libcxxabi/lib/buildit index 342543a02a5..8ebae2dfaea 100755 --- a/libcxxabi/lib/buildit +++ b/libcxxabi/lib/buildit @@ -28,7 +28,7 @@ then 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-*) diff --git a/libcxxabi/src/cxa_handlers.cpp b/libcxxabi/src/cxa_handlers.cpp index ab41db44d45..bd3f6f44760 100644 --- a/libcxxabi/src/cxa_handlers.cpp +++ b/libcxxabi/src/cxa_handlers.cpp @@ -177,10 +177,7 @@ terminate() _NOEXCEPT (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()); |
