[compiler-rt] r291511 - ASAN activate/deactive controls thread_local_quarantine_size_kb option.

[Diana Picus via llvm-commits]

I reverted all 3 of them in r291560 because the bots have been broken
for several hours now. Let me know if we can help you reproduce the
issue.

Diana

On 10 January 2017 at 10:57, Diana Picus <diana.picus at linaro.org> wrote:
> Hi,
>
> I think this or 509 or 510 is breaking some of our buildbots (see e.g.
> http://lab.llvm.org:8011/builders/clang-cmake-aarch64-42vma/builds/3037).
> Could you have a look?
>
> Thanks,
> Diana
>
> On 10 January 2017 at 01:49, Alex Shlyapnikov via llvm-commits
> <llvm-commits at lists.llvm.org> wrote:
>> Author: alekseyshl
>> Date: Mon Jan  9 17:49:17 2017
>> New Revision: 291511
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=291511&view=rev
>> Log:
>> ASAN activate/deactive controls thread_local_quarantine_size_kb option.
>>
>> Summary: Also, bypass quarantine altogether when quarantine size is set ot zero.
>>
>> Reviewers: eugenis
>>
>> Subscribers: kubabrecka, llvm-commits, mehdi_amini
>>
>> Differential Revision: https://reviews.llvm.org/D28480
>>
>> Modified:
>>     compiler-rt/trunk/lib/asan/asan_flags.cc
>>     compiler-rt/trunk/test/asan/TestCases/Linux/thread_local_quarantine_size_kb.cc
>>
>> Modified: compiler-rt/trunk/lib/asan/asan_flags.cc
>> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_flags.cc?rev=291511&r1=291510&r2=291511&view=diff
>> ==============================================================================
>> --- compiler-rt/trunk/lib/asan/asan_flags.cc (original)
>> +++ compiler-rt/trunk/lib/asan/asan_flags.cc Mon Jan  9 17:49:17 2017
>> @@ -169,6 +169,11 @@ void InitializeFlags() {
>>          (ASAN_LOW_MEMORY) ? 1 << 6 : FIRST_32_SECOND_64(1 << 8, 1 << 10);
>>      f->thread_local_quarantine_size_kb = kDefaultThreadLocalQuarantineSizeKb;
>>    }
>> +  if (f->thread_local_quarantine_size_kb == 0 && f->quarantine_size_mb > 0) {
>> +    Report("%s: thread_local_quarantine_size_kb can be set to 0 only when "
>> +           "quarantine_size_mb is set to 0\n", SanitizerToolName);
>> +    Die();
>> +  }
>>    if (!f->replace_str && common_flags()->intercept_strlen) {
>>      Report("WARNING: strlen interceptor is enabled even though replace_str=0. "
>>             "Use intercept_strlen=0 to disable it.");
>>
>> Modified: compiler-rt/trunk/test/asan/TestCases/Linux/thread_local_quarantine_size_kb.cc
>> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/thread_local_quarantine_size_kb.cc?rev=291511&r1=291510&r2=291511&view=diff
>> ==============================================================================
>> --- compiler-rt/trunk/test/asan/TestCases/Linux/thread_local_quarantine_size_kb.cc (original)
>> +++ compiler-rt/trunk/test/asan/TestCases/Linux/thread_local_quarantine_size_kb.cc Mon Jan  9 17:49:17 2017
>> @@ -5,8 +5,10 @@
>>  // RUN:   FileCheck %s --check-prefix=CHECK-VALUE
>>  // RUN: %env_asan_opts=thread_local_quarantine_size_kb=64:quarantine_size_mb=64 %run %t 2>&1 | \
>>  // RUN:   FileCheck %s --allow-empty --check-prefix=CHECK-SMALL-LOCAL-CACHE-SMALL-OVERHEAD
>> -// RUN: %env_asan_opts=thread_local_quarantine_size_kb=0:quarantine_size_mb=64 %run %t 2>&1 | \
>> -// RUN:   FileCheck %s --check-prefix=CHECK-NO-LOCAL-CACHE-HUGE-OVERHEAD
>> +// RUN: %env_asan_opts=thread_local_quarantine_size_kb=0:quarantine_size_mb=0 %run %t 2>&1 | \
>> +// RUN:   FileCheck %s --check-prefix=CHECK-QUARANTINE-DISABLED
>> +// RUN: %env_asan_opts=thread_local_quarantine_size_kb=0:quarantine_size_mb=64 not %run %t 2>&1 | \
>> +// RUN:   FileCheck %s --check-prefix=CHECK-FOR-PARAMETER-ERROR
>>
>>  #include <stdio.h>
>>  #include <stdlib.h>
>> @@ -37,4 +39,5 @@ int main() {
>>
>>  // CHECK-VALUE: thread_local_quarantine_size_kb=256K
>>  // CHECK-SMALL-LOCAL-CACHE-SMALL-OVERHEAD-NOT: Heap size limit exceeded
>> -// CHECK-NO-LOCAL-CACHE-HUGE-OVERHEAD: Heap size limit exceeded
>> +// CHECK-QUARANTINE-DISABLED-NOT: Heap size limit exceeded
>> +// CHECK-FOR-PARAMETER-ERROR: thread_local_quarantine_size_kb can be set to 0 only when quarantine_size_mb is set to 0
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits