[compiler-rt] r313480 - [compiler-rt] Fix build break after r313277 on s390x

[Kostya Serebryany via llvm-commits]

This is why we should not have #ifdefs in the code.

On Sun, Sep 17, 2017 at 2:38 AM, Ulrich Weigand via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: uweigand
> Date: Sun Sep 17 02:38:55 2017
> New Revision: 313480
>
> URL: http://llvm.org/viewvc/llvm-project?rev=313480&view=rev
> Log:
> [compiler-rt] Fix build break after r313277 on s390x
>
> Commit r313277 moved IsStackOverflow to inside the SignalContext
> class, but didn't update a code block in #ifdef s390x accordingly.
>
>
> Modified:
>     compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc
>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_
> posix_libcdep.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/
> sanitizer_common/sanitizer_posix_libcdep.cc?rev=313480&
> r1=313479&r2=313480&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc
> (original)
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc Sun
> Sep 17 02:38:55 2017
> @@ -223,7 +223,7 @@ bool SignalContext::IsStackOverflow() co
>    // On s390, the fault address in siginfo points to start of the page,
> not
>    // to the precise word that was accessed.  Mask off the low bits of sp
> to
>    // take it into account.
> -  bool IsStackAccess = sig.addr >= (sig.sp & ~0xFFF) && sig.addr < sp +
> 0xFFFF;
> +  bool IsStackAccess = addr >= (sp & ~0xFFF) && addr < sp + 0xFFFF;
>  #else
>    bool IsStackAccess = addr + 512 > sp && addr < sp + 0xFFFF;
>  #endif
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170917/8fad99c6/attachment.html>