diff options
| author | Sergey Matveev <earthdok@google.com> | 2013-05-08 12:45:55 +0000 |
|---|---|---|
| committer | Sergey Matveev <earthdok@google.com> | 2013-05-08 12:45:55 +0000 |
| commit | 736cf49a46b3cc5aa1856762f85e6f2799c24e5a (patch) | |
| tree | 7a72a032a7a1c679458a20b522d21640920c096e /lib/asan/asan_stack.h | |
| parent | 8496afd9f88f5fa35d6cf26d47eaec6d4ebbadb3 (diff) | |
| download | compiler-rt-736cf49a46b3cc5aa1856762f85e6f2799c24e5a.tar.gz compiler-rt-736cf49a46b3cc5aa1856762f85e6f2799c24e5a.tar.bz2 compiler-rt-736cf49a46b3cc5aa1856762f85e6f2799c24e5a.tar.xz | |
[sanitizer] Move GetStackTrace from ASan to sanitizer_common.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@181424 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_stack.h')
| -rw-r--r-- | lib/asan/asan_stack.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/lib/asan/asan_stack.h b/lib/asan/asan_stack.h index cd30abbb..176aa183 100644 --- a/lib/asan/asan_stack.h +++ b/lib/asan/asan_stack.h @@ -15,12 +15,12 @@ #define ASAN_STACK_H #include "asan_flags.h" +#include "asan_thread.h" #include "sanitizer_common/sanitizer_flags.h" #include "sanitizer_common/sanitizer_stacktrace.h" namespace __asan { -void GetStackTrace(StackTrace *stack, uptr max_s, uptr pc, uptr bp, bool fast); void PrintStack(StackTrace *stack); } // namespace __asan @@ -28,10 +28,24 @@ void PrintStack(StackTrace *stack); // Get the stack trace with the given pc and bp. // The pc will be in the position 0 of the resulting stack trace. // The bp may refer to the current frame or to the caller's frame. -// fast_unwind is currently unused. +#if SANITIZER_WINDOWS #define GET_STACK_TRACE_WITH_PC_AND_BP(max_s, pc, bp, fast) \ StackTrace stack; \ - GetStackTrace(&stack, max_s, pc, bp, fast) + GetStackTrace(&stack, max_s, pc, bp, 0, 0, fast) +#else +#define GET_STACK_TRACE_WITH_PC_AND_BP(max_s, pc, bp, fast) \ + StackTrace stack; \ + { \ + uptr stack_top = 0, stack_bottom = 0; \ + AsanThread *t; \ + if (asan_inited && (t = GetCurrentThread())) { \ + stack_top = t->stack_top(); \ + stack_bottom = t->stack_bottom(); \ + } \ + GetStackTrace(&stack, max_s, pc, bp, \ + stack_top, stack_bottom, fast); \ + } +#endif // SANITIZER_WINDOWS // NOTE: A Rule of thumb is to retrieve stack trace in the interceptors // as early as possible (in functions exposed to the user), as we generally |