diff options
| author | Kostya Serebryany <kcc@google.com> | 2012-08-28 14:11:57 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2012-08-28 14:11:57 +0000 |
| commit | 1b5ea8fbbef73f5d9b41dbb26a21b9a0f4d1445e (patch) | |
| tree | 7f362a83c95d0bb87259334b440af860afeaaf0a /lib/asan/asan_internal.h | |
| parent | cc347222d55967fdb775429a8a0a3a5d795b8b50 (diff) | |
| download | compiler-rt-1b5ea8fbbef73f5d9b41dbb26a21b9a0f4d1445e.tar.gz compiler-rt-1b5ea8fbbef73f5d9b41dbb26a21b9a0f4d1445e.tar.bz2 compiler-rt-1b5ea8fbbef73f5d9b41dbb26a21b9a0f4d1445e.tar.xz | |
[asan] actually move StackTrace to sanitizer_common
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162757 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_internal.h')
| -rw-r--r-- | lib/asan/asan_internal.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/asan/asan_internal.h b/lib/asan/asan_internal.h index 1d18026d..46741c94 100644 --- a/lib/asan/asan_internal.h +++ b/lib/asan/asan_internal.h @@ -17,6 +17,7 @@ #include "asan_flags.h" #include "sanitizer_common/sanitizer_common.h" #include "sanitizer_common/sanitizer_internal_defs.h" +#include "sanitizer_common/sanitizer_stacktrace.h" #include "sanitizer_common/sanitizer_libc.h" #if !defined(__linux__) && !defined(__APPLE__) && !defined(_WIN32) @@ -93,7 +94,7 @@ extern "C" void* _ReturnAddress(void); namespace __asan { class AsanThread; -struct StackTrace; +using __sanitizer::StackTrace; // asan_rtl.cc void NORETURN ShowStatsAndAbort(); @@ -145,17 +146,6 @@ extern int asan_inited; extern bool asan_init_is_running; extern void (*death_callback)(void); -#if !defined(_WIN32) || defined(__clang__) -# define GET_CALLER_PC() (uptr)__builtin_return_address(0) -# define GET_CURRENT_FRAME() (uptr)__builtin_frame_address(0) -#else -# define GET_CALLER_PC() (uptr)_ReturnAddress() -// CaptureStackBackTrace doesn't need to know BP on Windows. -// FIXME: This macro is still used when printing error reports though it's not -// clear if the BP value is needed in the ASan reports on Windows. -# define GET_CURRENT_FRAME() (uptr)0xDEADBEEF -#endif - #ifdef _WIN32 bool WinSymbolize(const void *addr, char *out_buffer, int buffer_size); #endif // _WIN32 |