[compiler-rt] r303324 - temporary disable stndup interceptor, due to r302781 being buggy

[Diana Picus via llvm-commits]

Actually, I think you just missed one of the tests that r302781 added.
I committed r303338 to try and fix it, let's see how it goes.

Diana

On 18 May 2017 at 11:12, Diana Picus <diana.picus at linaro.org> wrote:
> Hi Kostya,
>
> I suspect this broke our buildbots:
> http://lab.llvm.org:8011/builders/clang-cmake-aarch64-42vma/builds/7559
>
> Can you please fix or revert? They've been red for quite some time now.
>
> Thanks,
> Diana
>
> On 18 May 2017 at 05:00, Kostya Serebryany via llvm-commits
> <llvm-commits at lists.llvm.org> wrote:
>> Author: kcc
>> Date: Wed May 17 22:00:07 2017
>> New Revision: 303324
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=303324&view=rev
>> Log:
>> temporary disable stndup interceptor, due to r302781 being buggy
>>
>> Modified:
>>     compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
>>     compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_test_utils.h
>>     compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc
>>
>> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
>> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h?rev=303324&r1=303323&r2=303324&view=diff
>> ==============================================================================
>> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h (original)
>> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h Wed May 17 22:00:07 2017
>> @@ -98,8 +98,9 @@
>>  #define SANITIZER_INTERCEPT_MEMMOVE 1
>>  #define SANITIZER_INTERCEPT_MEMCPY 1
>>  #define SANITIZER_INTERCEPT_MEMCMP 1
>> -#define SANITIZER_INTERCEPT_STRNDUP SI_POSIX
>> -#define SANITIZER_INTERCEPT___STRNDUP SI_LINUX_NOT_FREEBSD
>> +// temporary disabled until r302781 is reverted or fixed.
>> +#define SANITIZER_INTERCEPT_STRNDUP (0 && SI_POSIX)
>> +#define SANITIZER_INTERCEPT___STRNDUP (0 && SI_LINUX_NOT_FREEBSD)
>>  #if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
>>      __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
>>  # define SI_MAC_DEPLOYMENT_BELOW_10_7 1
>>
>> Modified: compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_test_utils.h
>> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_test_utils.h?rev=303324&r1=303323&r2=303324&view=diff
>> ==============================================================================
>> --- compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_test_utils.h (original)
>> +++ compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_test_utils.h Wed May 17 22:00:07 2017
>> @@ -125,7 +125,8 @@ static inline uint32_t my_rand() {
>>  #endif
>>
>>  #if !defined(_MSC_VER)
>> -# define SANITIZER_TEST_HAS_STRNDUP 1
>> +// Test temporary disabled until r302781 is reverted or fixed.
>> +# define SANITIZER_TEST_HAS_STRNDUP 0
>>  #else
>>  # define SANITIZER_TEST_HAS_STRNDUP 0
>>  #endif
>>
>> Modified: compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc
>> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc?rev=303324&r1=303323&r2=303324&view=diff
>> ==============================================================================
>> --- compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc (original)
>> +++ compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc Wed May 17 22:00:07 2017
>> @@ -1,10 +1,11 @@
>> -// RUN: %clangxx_asan -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
>> -// RUN: %clangxx_asan -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s
>> -// RUN: %clangxx_asan -O2 %s -o %t && not %run %t 2>&1 | FileCheck %s
>> -// RUN: %clangxx_asan -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
>> +// RUN: echo DISABLED
>> +// DISABLED: %clangxx_asan -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
>> +// DISABLED: %clangxx_asan -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s
>> +// DISABLED: %clangxx_asan -O2 %s -o %t && not %run %t 2>&1 | FileCheck %s
>> +// DISABLED: %clangxx_asan -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
>>
>>  // When built as C on Linux, strndup is transformed to __strndup.
>> -// RUN: %clangxx_asan -O3 -xc %s -o %t && not %run %t 2>&1 | FileCheck %s
>> +// DISABLED: %clangxx_asan -O3 -xc %s -o %t && not %run %t 2>&1 | FileCheck %s
>>
>>  // Unwind problem on arm: "main" is missing from the allocation stack trace.
>>  // UNSUPPORTED: win32,s390,armv7l-unknown-linux-gnueabihf
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits