[compiler-rt] r202849 - Fix StackTrace::LocatePcInTrace, add more unit tests for generic StackTrace

[Alexey Samsonov]

Author: samsonov
Date: Tue Mar  4 08:06:11 2014
New Revision: 202849

URL: http://llvm.org/viewvc/llvm-project?rev=202849&view=rev
Log:
Fix StackTrace::LocatePcInTrace, add more unit tests for generic StackTrace

Modified:
    compiler-rt/trunk/lib/asan/asan_stack.h
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc
    compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc

Modified: compiler-rt/trunk/lib/asan/asan_stack.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_stack.h?rev=202849&r1=202848&r2=202849&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_stack.h (original)
+++ compiler-rt/trunk/lib/asan/asan_stack.h Tue Mar  4 08:06:11 2014
@@ -59,9 +59,9 @@ void GetStackTraceWithPcBpAndContext(Sta
     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(),                \

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc?rev=202849&r1=202848&r2=202849&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc Tue Mar  4 08:06:11 2014
@@ -72,7 +72,7 @@ void StackTrace::PopStackFrames(uptr cou
 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;

Modified: compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc?rev=202849&r1=202848&r2=202849&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc Tue Mar  4 08:06:11 2014
@@ -102,4 +102,26 @@ TEST_F(FastUnwindTest, OneFrameStackTrac
   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