[libcxxabi] r311047 - Revert "[libcxxabi] When built with ASan, __cxa_throw calls __asan_handle_no_return"

[Petr Hosek via cfe-commits]

Author: phosek
Date: Wed Aug 16 15:05:54 2017
New Revision: 311047

URL: http://llvm.org/viewvc/llvm-project?rev=311047&view=rev
Log:
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.

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=311047&r1=311046&r2=311047&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_exception.cpp (original)
+++ libcxxabi/trunk/src/cxa_exception.cpp Wed Aug 16 15:05:54 2017
@@ -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::ty
     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