diff options
| author | Alexey Samsonov <samsonov@google.com> | 2014-03-04 14:06:11 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2014-03-04 14:06:11 +0000 |
| commit | 4c1a68075f6f81ba1af79b94b20eeaf70cafa9d4 (patch) | |
| tree | 47ec5add7943a581444571c37ad891417b502765 /lib | |
| parent | 0e4063eb09c0b47d2e52b3b92478d993db76c163 (diff) | |
Fix StackTrace::LocatePcInTrace, add more unit tests for generic StackTrace
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@202849 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asan/asan_stack.h | 4 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_stacktrace.cc | 2 | ||||
| -rw-r--r-- | lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc | 22 |
3 files changed, 25 insertions, 3 deletions
diff --git a/lib/asan/asan_stack.h b/lib/asan/asan_stack.h index 3cbd2dad4..5db1d1a26 100644 --- a/lib/asan/asan_stack.h +++ b/lib/asan/asan_stack.h @@ -59,9 +59,9 @@ void GetStackTraceWithPcBpAndContext(StackTrace *stack, uptr max_depth, uptr pc, if (max_size > 0) { \ stack.top_frame_bp = GET_CURRENT_FRAME(); \ stack.trace[0] = StackTrace::GetCurrentPc(); \ + if (max_size > 1) \ + stack.trace[1] = GET_CALLER_PC(); \ } \ - if (max_size > 1) \ - stack.trace[1] = GET_CALLER_PC(); \ } else { \ GetStackTraceWithPcBpAndContext(&stack, max_size, \ StackTrace::GetCurrentPc(), \ diff --git a/lib/sanitizer_common/sanitizer_stacktrace.cc b/lib/sanitizer_common/sanitizer_stacktrace.cc index df1475737..85c6fd591 100644 --- a/lib/sanitizer_common/sanitizer_stacktrace.cc +++ b/lib/sanitizer_common/sanitizer_stacktrace.cc @@ -72,7 +72,7 @@ void StackTrace::PopStackFrames(uptr count) { uptr StackTrace::LocatePcInTrace(uptr pc) { // Use threshold to find PC in stack trace, as PC we want to unwind from may // slightly differ from return address in the actual unwinded stack trace. - const int kPcThreshold = 192; + const int kPcThreshold = 256; for (uptr i = 0; i < size; ++i) { if (MatchPc(pc, trace[i], kPcThreshold)) return i; diff --git a/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc b/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc index 540b4dce9..b71044a61 100644 --- a/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc +++ b/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc @@ -102,4 +102,26 @@ TEST_F(FastUnwindTest, OneFrameStackTrace) { EXPECT_EQ((uptr)&fake_stack[0], trace.top_frame_bp); } +TEST_F(FastUnwindTest, ZeroFramesStackTrace) { + if (!TryFastUnwind(0)) + return; + EXPECT_EQ(0U, trace.size); + EXPECT_EQ(0U, trace.top_frame_bp); +} + +TEST(SlowUnwindTest, ShortStackTrace) { + if (StackTrace::WillUseFastUnwind(false)) + return; + StackTrace stack; + uptr pc = StackTrace::GetCurrentPc(); + uptr bp = GET_CURRENT_FRAME(); + stack.Unwind(0, pc, bp, 0, 0, 0, false); + EXPECT_EQ(0U, stack.size); + EXPECT_EQ(0U, stack.top_frame_bp); + stack.Unwind(1, pc, bp, 0, 0, 0, false); + EXPECT_EQ(1U, stack.size); + EXPECT_EQ(pc, stack.trace[0]); + EXPECT_EQ(bp, stack.top_frame_bp); +} + } // namespace __sanitizer |