<div dir="ltr">thanks!<div>Note: I hope to kill this code sometime soon. </div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 24, 2017 at 9:45 AM, Reid Kleckner 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">Author: rnk<br>
Date: Tue Jan 24 11:45:35 2017<br>
New Revision: 292955<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=292955&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=292955&view=rev</a><br>
Log:<br>
Fix pc_array bounds check to use elements instead of bytes<br>
<br>
pc_array_size and kPcArrayMaxSize appear to be measured in elements, not<br>
bytes, so we shouldn't multiply idx by sizeof(uptr) in this bounds<br>
check.  32-bit Chrome was tripping this assertion because it has 64<br>
million coverage points. I don't think it's worth adding a test that has<br>
that many coverage points.<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>coverage_libcdep.cc<br>
<br>
Modified: compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>coverage_libcdep.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc?rev=292955&r1=292954&r2=292955&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>coverage_libcdep.cc?rev=<wbr>292955&r1=292954&r2=292955&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>coverage_libcdep.cc (original)<br>
+++ compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>coverage_libcdep.cc Tue Jan 24 11:45:35 2017<br>
@@ -415,8 +415,7 @@ void CoverageData::Add(uptr pc, u32 *gua<br>
   uptr idx = -guard_value - 1;<br>
   if (idx >= atomic_load(&pc_array_index, memory_order_acquire))<br>
     return;  // May happen after fork when pc_array_index becomes 0.<br>
-  CHECK_LT(idx * sizeof(uptr),<br>
-           atomic_load(&pc_array_size, memory_order_acquire));<br>
+  CHECK_LT(idx, atomic_load(&pc_array_size, memory_order_acquire));<br>
   uptr counter = atomic_fetch_add(&coverage_<wbr>counter, 1, memory_order_relaxed);<br>
   pc_array[idx] = BundlePcAndCounter(pc, counter);<br>
 }<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>
</blockquote></div><br></div>