From: Maxim Ostapenko Date: Tue, 8 Nov 2016 22:07:50 +0000 (+0000) Subject: sanitizer_stacktrace.cc (GetCanonicFrame): Assume we compiled code with GCC when... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=789306de0fa860eebe32a2677d87d1203bbb81f4;p=gcc.git sanitizer_stacktrace.cc (GetCanonicFrame): Assume we compiled code with GCC when extracting the caller PC for ARM if... 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: r241980 --- diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 166571485a6..7881ac7da39 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2016-11-09 Maxim Ostapenko + + * 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. + 2016-11-09 Maxim Ostapenko PR sanitizer/63958 diff --git a/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc b/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc index 531f256c048..cbb3af270b6 100644 --- a/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc +++ b/libsanitizer/sanitizer_common/sanitizer_stacktrace.cc @@ -55,8 +55,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