sanitizer_stacktrace.cc (GetCanonicFrame): Assume we compiled code with GCC when...

libsanitizer/

	* sanitizer_common/sanitizer_stacktrace.cc (GetCanonicFrame): Assume we
	compiled code with GCC when extracting the caller PC for ARM if no
	valid frame pointer is available.

From-SVN: r229115

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 80ce1585857aacec7110c77415d511c263116d2a..2ed4cc321913f0dea1d811323c5b88c90cadc9be 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-21  Maxim Ostapenko  <m.ostapenko@partner.samsung.com>
+
+       * sanitizer_common/sanitizer_stacktrace.cc (GetCanonicFrame): Assume we
+       compiled code with GCC when extracting the caller PC for ARM if no
+       valid frame pointer is available.
+
 2015-10-21  Maxim Ostapenko  <m.ostapenko@partner.samsung.com>
 
        PR bootstrap/63888

diff --git a/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc b/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc
index 7b0c084b1a2c868ad6bc577a264e072809c085de..796d472a1eba948bbdad06aac920f4ba7d9e75ae 100644 (file)
--- a/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc
@@ -60,8 +60,8 @@ static inline uhwptr *GetCanonicFrame(uptr bp,
   // Nope, this does not look right either. This means the frame after next does
   // not have a valid frame pointer, but we can still extract the caller PC.
   // Unfortunately, there is no way to decide between GCC and LLVM frame
-  // layouts. Assume LLVM.
-  return bp_prev;
+  // layouts. Assume GCC.
+  return bp_prev - 1;
 #else
   return (uhwptr*)bp;
 #endif