wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Petr Hosek 2017-08-16 22:05:54 +00:00
parent 5502eb0986
commit ce7aa6f2bd
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libcxxabi/src/cxa_exception.cpp
View File

@ -19,10 +19,6 @@
#include "cxa_handlers.hpp" #include "cxa_handlers.hpp"
#include "fallback_malloc.h" #include "fallback_malloc.h"
#if __has_feature(address_sanitizer)
#include <sanitizer/asan_interface.h>
#endif
// +---------------------------+-----------------------------+---------------+ // +---------------------------+-----------------------------+---------------+
// | __cxa_exception | _Unwind_Exception CLNGC++\0 | thrown object | // | __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 globals->uncaughtExceptions += 1; // Not atomically, since globals are thread-local
exception_header->unwindHeader.exception_cleanup = exception_cleanup_func; 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__ #ifdef __USING_SJLJ_EXCEPTIONS__
_Unwind_SjLj_RaiseException(&exception_header->unwindHeader); _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
#else #else