[sanitizer] Fix off-by-one-line in SEGV reports on Android.

This will be covered by null_deref.cc test (requires one more fix to pass).

llvm-svn: 201325

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
index 4e29e25..04ab618 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
@@ -258,8 +258,10 @@ void StackTrace::SlowUnwindStackWithContext(uptr pc, void *context,
   if (res < 0) return;
   CHECK((uptr)res <= kStackTraceMax);
 
+  // +2 compensate for libcorkscrew unwinder returning addresses of call
+  // instructions instead of raw return addresses.
   for (sptr i = 0; i < res; ++i)
-    trace[size++] = frames[i].absolute_pc;
+    trace[size++] = frames[i].absolute_pc + 2;
 }
 
 #endif  // !SANITIZER_GO