commit 359c105c927a6ed1213f047a353eb391af4aff48
author Alexey Samsonov <samsonov@google.com> Tue Mar 04 14:06:11 2014 +0000
committer Alexey Samsonov <samsonov@google.com> Tue Mar 04 14:06:11 2014 +0000
tree e3f291a3216c9a7948fb103831fb83ffad73a7ef
parent d920770addd99f7cdc8c6e0f817ca807ea932ba1

Fix StackTrace::LocatePcInTrace, add more unit tests for generic StackTrace

llvm-svn: 202849

compiler-rt/lib/asan/asan_stack.h

diff --git a/compiler-rt/lib/asan/asan_stack.h b/compiler-rt/lib/asan/asan_stack.h
index 3cbd2da..5db1d1a 100644
--- a/compiler-rt/lib/asan/asan_stack.h
+++ b/compiler-rt/lib/asan/asan_stack.h
@@ -59,9 +59,9 @@
     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(),                \