<div dir="ltr">Sorry for the breakage, thank you for reverting, will look into it.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 10, 2017 at 3:27 AM, Diana Picus <span dir="ltr"><<a href="mailto:diana.picus@linaro.org" target="_blank">diana.picus@linaro.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I reverted all 3 of them in r291560 because the bots have been broken<br>
for several hours now. Let me know if we can help you reproduce the<br>
issue.<br>
<span class="HOEnZb"><font color="#888888"><br>
Diana<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
On 10 January 2017 at 10:57, Diana Picus <<a href="mailto:diana.picus@linaro.org">diana.picus@linaro.org</a>> wrote:<br>
> Hi,<br>
><br>
> I think this or 509 or 510 is breaking some of our buildbots (see e.g.<br>
> <a href="http://lab.llvm.org:8011/builders/clang-cmake-aarch64-42vma/builds/3037" rel="noreferrer" target="_blank">http://lab.llvm.org:8011/<wbr>builders/clang-cmake-aarch64-<wbr>42vma/builds/3037</a>).<br>
> Could you have a look?<br>
><br>
> Thanks,<br>
> Diana<br>
><br>
> On 10 January 2017 at 01:49, Alex Shlyapnikov via llvm-commits<br>
> <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br>
>> Author: alekseyshl<br>
>> Date: Mon Jan  9 17:49:17 2017<br>
>> New Revision: 291511<br>
>><br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=291511&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=291511&view=rev</a><br>
>> Log:<br>
>> ASAN activate/deactive controls thread_local_quarantine_size_<wbr>kb option.<br>
>><br>
>> Summary: Also, bypass quarantine altogether when quarantine size is set ot zero.<br>
>><br>
>> Reviewers: eugenis<br>
>><br>
>> Subscribers: kubabrecka, llvm-commits, mehdi_amini<br>
>><br>
>> Differential Revision: <a href="https://reviews.llvm.org/D28480" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D28480</a><br>
>><br>
>> Modified:<br>
>>     compiler-rt/trunk/lib/asan/<wbr>asan_flags.cc<br>
>>     compiler-rt/trunk/test/asan/<wbr>TestCases/Linux/thread_local_<wbr>quarantine_size_kb.cc<br>
>><br>
>> Modified: compiler-rt/trunk/lib/asan/<wbr>asan_flags.cc<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_flags.cc?rev=291511&r1=291510&r2=291511&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/lib/<wbr>asan/asan_flags.cc?rev=291511&<wbr>r1=291510&r2=291511&view=diff</a><br>
>> ==============================<wbr>==============================<wbr>==================<br>
>> --- compiler-rt/trunk/lib/asan/<wbr>asan_flags.cc (original)<br>
>> +++ compiler-rt/trunk/lib/asan/<wbr>asan_flags.cc Mon Jan  9 17:49:17 2017<br>
>> @@ -169,6 +169,11 @@ void InitializeFlags() {<br>
>>          (ASAN_LOW_MEMORY) ? 1 << 6 : FIRST_32_SECOND_64(1 << 8, 1 << 10);<br>
>>      f->thread_local_quarantine_<wbr>size_kb = kDefaultThreadLocalQuarantineS<wbr>izeKb;<br>
>>    }<br>
>> +  if (f->thread_local_quarantine_<wbr>size_kb == 0 && f->quarantine_size_mb > 0) {<br>
>> +    Report("%s: thread_local_quarantine_size_<wbr>kb can be set to 0 only when "<br>
>> +           "quarantine_size_mb is set to 0\n", SanitizerToolName);<br>
>> +    Die();<br>
>> +  }<br>
>>    if (!f->replace_str && common_flags()->intercept_<wbr>strlen) {<br>
>>      Report("WARNING: strlen interceptor is enabled even though replace_str=0. "<br>
>>             "Use intercept_strlen=0 to disable it.");<br>
>><br>
>> Modified: compiler-rt/trunk/test/asan/<wbr>TestCases/Linux/thread_local_<wbr>quarantine_size_kb.cc<br>
>> URL: <a href="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" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/<wbr>test/asan/TestCases/Linux/<wbr>thread_local_quarantine_size_<wbr>kb.cc?rev=291511&r1=291510&r2=<wbr>291511&view=diff</a><br>
>> ==============================<wbr>==============================<wbr>==================<br>
>> --- compiler-rt/trunk/test/asan/<wbr>TestCases/Linux/thread_local_<wbr>quarantine_size_kb.cc (original)<br>
>> +++ compiler-rt/trunk/test/asan/<wbr>TestCases/Linux/thread_local_<wbr>quarantine_size_kb.cc Mon Jan  9 17:49:17 2017<br>
>> @@ -5,8 +5,10 @@<br>
>>  // RUN:   FileCheck %s --check-prefix=CHECK-VALUE<br>
>>  // RUN: %env_asan_opts=thread_local_<wbr>quarantine_size_kb=64:<wbr>quarantine_size_mb=64 %run %t 2>&1 | \<br>
>>  // RUN:   FileCheck %s --allow-empty --check-prefix=CHECK-SMALL-<wbr>LOCAL-CACHE-SMALL-OVERHEAD<br>
>> -// RUN: %env_asan_opts=thread_local_<wbr>quarantine_size_kb=0:<wbr>quarantine_size_mb=64 %run %t 2>&1 | \<br>
>> -// RUN:   FileCheck %s --check-prefix=CHECK-NO-LOCAL-<wbr>CACHE-HUGE-OVERHEAD<br>
>> +// RUN: %env_asan_opts=thread_local_<wbr>quarantine_size_kb=0:<wbr>quarantine_size_mb=0 %run %t 2>&1 | \<br>
>> +// RUN:   FileCheck %s --check-prefix=CHECK-<wbr>QUARANTINE-DISABLED<br>
>> +// RUN: %env_asan_opts=thread_local_<wbr>quarantine_size_kb=0:<wbr>quarantine_size_mb=64 not %run %t 2>&1 | \<br>
>> +// RUN:   FileCheck %s --check-prefix=CHECK-FOR-<wbr>PARAMETER-ERROR<br>
>><br>
>>  #include <stdio.h><br>
>>  #include <stdlib.h><br>
>> @@ -37,4 +39,5 @@ int main() {<br>
>><br>
>>  // CHECK-VALUE: thread_local_quarantine_size_<wbr>kb=256K<br>
>>  // CHECK-SMALL-LOCAL-CACHE-SMALL-<wbr>OVERHEAD-NOT: Heap size limit exceeded<br>
>> -// CHECK-NO-LOCAL-CACHE-HUGE-<wbr>OVERHEAD: Heap size limit exceeded<br>
>> +// CHECK-QUARANTINE-DISABLED-NOT: Heap size limit exceeded<br>
>> +// CHECK-FOR-PARAMETER-ERROR: thread_local_quarantine_size_<wbr>kb can be set to 0 only when quarantine_size_mb is set to 0<br>
>><br>
>><br>
>> ______________________________<wbr>_________________<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/<wbr>mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div>