<div dir="ltr">The bot is still red.<div>Shall we revert? </div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Oct 6, 2015 at 2:02 PM, Evgenii Stepanov via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This breaks the sanitizer bot:<br>
<a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/20637/steps/build%20compiler-rt%20android%2Faarch64/logs/stdio" rel="noreferrer" target="_blank">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/20637/steps/build%20compiler-rt%20android%2Faarch64/logs/stdio</a><br>
<div class="HOEnZb"><div class="h5"><br>
On Mon, Oct 5, 2015 at 12:16 PM, Adhemerval Zanella via llvm-commits<br>
<<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br>
> Author: azanella<br>
> Date: Mon Oct  5 14:16:09 2015<br>
> New Revision: 249337<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=249337&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=249337&view=rev</a><br>
> Log:<br>
> [lsan] [aarch64] Add support for AArch64<br>
><br>
> This patch add support for leak sanitizer for aarch64.  Similar to<br>
> MIPS it uses a SizeClassAllocator32 due VMA constraints (aarch64<br>
> currently supports 39 and 42-bit VMA).<br>
><br>
> Modified:<br>
>     compiler-rt/trunk/cmake/config-ix.cmake<br>
>     compiler-rt/trunk/lib/lsan/lsan_allocator.cc<br>
>     compiler-rt/trunk/lib/lsan/lsan_common.cc<br>
>     compiler-rt/trunk/lib/lsan/lsan_common.h<br>
>     compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc<br>
><br>
> Modified: compiler-rt/trunk/cmake/config-ix.cmake<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=249337&r1=249336&r2=249337&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=249337&r1=249336&r2=249337&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/cmake/config-ix.cmake (original)<br>
> +++ compiler-rt/trunk/cmake/config-ix.cmake Mon Oct  5 14:16:09 2015<br>
> @@ -266,7 +266,7 @@ set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH<br>
>  set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}<br>
>      ${MIPS32} ${MIPS64} ${PPC64})<br>
>  set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64})<br>
> -set(ALL_LSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64})<br>
> +set(ALL_LSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64})<br>
>  set(ALL_MSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64})<br>
>  set(ALL_PROFILE_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${PPC64}<br>
>      ${MIPS32} ${MIPS64})<br>
><br>
> Modified: compiler-rt/trunk/lib/lsan/lsan_allocator.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lsan_allocator.cc?rev=249337&r1=249336&r2=249337&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lsan_allocator.cc?rev=249337&r1=249336&r2=249337&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/lsan/lsan_allocator.cc (original)<br>
> +++ compiler-rt/trunk/lib/lsan/lsan_allocator.cc Mon Oct  5 14:16:09 2015<br>
> @@ -32,7 +32,7 @@ struct ChunkMetadata {<br>
>    u32 stack_trace_id;<br>
>  };<br>
><br>
> -#if defined(__mips64)<br>
> +#if defined(__mips64) || defined(__aarch64__)<br>
>  static const uptr kMaxAllowedMallocSize = 4UL << 30;<br>
>  static const uptr kRegionSizeLog = 20;<br>
>  static const uptr kNumRegions = SANITIZER_MMAP_RANGE_SIZE >> kRegionSizeLog;<br>
><br>
> Modified: compiler-rt/trunk/lib/lsan/lsan_common.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lsan_common.cc?rev=249337&r1=249336&r2=249337&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lsan_common.cc?rev=249337&r1=249336&r2=249337&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/lsan/lsan_common.cc (original)<br>
> +++ compiler-rt/trunk/lib/lsan/lsan_common.cc Mon Oct  5 14:16:09 2015<br>
> @@ -119,6 +119,8 @@ static inline bool CanBeAHeapPointer(upt<br>
>    return ((p >> 47) == 0);<br>
>  #elif defined(__mips64)<br>
>    return ((p >> 40) == 0);<br>
> +#elif defined(__aarch64__)<br>
> +  return ((p >> SANITIZER_AARCH64_VMA) == 0);<br>
>  #else<br>
>    return true;<br>
>  #endif<br>
><br>
> Modified: compiler-rt/trunk/lib/lsan/lsan_common.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lsan_common.h?rev=249337&r1=249336&r2=249337&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lsan_common.h?rev=249337&r1=249336&r2=249337&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/lsan/lsan_common.h (original)<br>
> +++ compiler-rt/trunk/lib/lsan/lsan_common.h Mon Oct  5 14:16:09 2015<br>
> @@ -22,8 +22,9 @@<br>
>  #include "sanitizer_common/sanitizer_stoptheworld.h"<br>
>  #include "sanitizer_common/sanitizer_symbolizer.h"<br>
><br>
> -#if SANITIZER_LINUX && (defined(__x86_64__) || defined(__mips64)) \<br>
> -    && (SANITIZER_WORDSIZE == 64)<br>
> +#if SANITIZER_LINUX && (SANITIZER_WORDSIZE == 64) && (defined(__x86_64__) \<br>
> +                                                  ||  defined(__mips64) \<br>
> +                                                  ||  defined(__aarch64__))<br>
>  #define CAN_SANITIZE_LEAKS 1<br>
>  #else<br>
>  #define CAN_SANITIZE_LEAKS 0<br>
><br>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=249337&r1=249336&r2=249337&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=249337&r1=249336&r2=249337&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc (original)<br>
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc Mon Oct  5 14:16:09 2015<br>
> @@ -497,7 +497,7 @@ void BlockingMutex::CheckLocked() {<br>
>  // Note that getdents64 uses a different structure format. We only provide the<br>
>  // 32-bit syscall here.<br>
>  struct linux_dirent {<br>
> -#if SANITIZER_X32<br>
> +#if SANITIZER_X32 || defined(__aarch64__)<br>
>    u64 d_ino;<br>
>    u64 d_off;<br>
>  #else<br>
> @@ -505,6 +505,9 @@ struct linux_dirent {<br>
>    unsigned long      d_off;<br>
>  #endif<br>
>    unsigned short     d_reclen;<br>
> +#ifdef __aarch64__<br>
> +  unsigned char      d_type;<br>
> +#endif<br>
>    char               d_name[256];<br>
>  };<br>
><br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div>