diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-08-16 22:05:54 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-08-16 22:05:54 +0000 |
| commit | ce7aa6f2bde5cb1e5982e37c60d5c78210fb7462 (patch) | |
| tree | 4afb9591ab19b2c821a46527a57feef7e24491a8 /libcxxabi/src/cxa_exception.cpp | |
| parent | 5502eb0986d136654391fff4716b22cddf2fbc3c (diff) | |
| download | bcm5719-llvm-ce7aa6f2bde5cb1e5982e37c60d5c78210fb7462.tar.gz bcm5719-llvm-ce7aa6f2bde5cb1e5982e37c60d5c78210fb7462.zip | |
Revert "[libcxxabi] When built with ASan, __cxa_throw calls __asan_handle_no_return"
This reverts commit r311045 because it's causing an error on
libcxx-libcxxabi-x86_64-linux-ubuntu-asan bot.
llvm-svn: 311047
Diffstat (limited to 'libcxxabi/src/cxa_exception.cpp')
| -rw-r--r-- | libcxxabi/src/cxa_exception.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libcxxabi/src/cxa_exception.cpp b/libcxxabi/src/cxa_exception.cpp index 204ea2ded00..0794444bcc5 100644 --- a/libcxxabi/src/cxa_exception.cpp +++ b/libcxxabi/src/cxa_exception.cpp @@ -19,10 +19,6 @@ #include "cxa_handlers.hpp" #include "fallback_malloc.h" -#if __has_feature(address_sanitizer) -#include <sanitizer/asan_interface.h> -#endif - // +---------------------------+-----------------------------+---------------+ // | __cxa_exception | _Unwind_Exception CLNGC++\0 | thrown object | // +---------------------------+-----------------------------+---------------+ @@ -221,12 +217,6 @@ __cxa_throw(void *thrown_object, std::type_info *tinfo, void (*dest)(void *)) { globals->uncaughtExceptions += 1; // Not atomically, since globals are thread-local exception_header->unwindHeader.exception_cleanup = exception_cleanup_func; - -#if __has_feature(address_sanitizer) - // Inform the ASan runtime that now might be a good time to clean stuff up. - __asan_handle_no_return(); -#endif - #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); #else |
