diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-09-06 03:00:42 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-09-06 03:00:42 +0000 |
| commit | caa78daf9285dada17e3e6b8aebcf7d128427f83 (patch) | |
| tree | 189ddee7d73f72f61d70ad0789fe5a4e2286b519 | |
| parent | f6e94df5624f1e4dcddbde98001cdd83b0a7d4a1 (diff) | |
Revert "[libcxxabi] When built with ASan, __cxa_throw calls __asan_handle_no_return"
This reverts commit r312606 because it's causing an error on
libcxx-libcxxabi-x86_64-linux-ubuntu-asan bot.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@312609 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | src/cxa_exception.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/cxa_exception.cpp b/src/cxa_exception.cpp index 204ea2d..0794444 100644 --- a/src/cxa_exception.cpp +++ b/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 |