<div dir="ltr">reverted with r283183 as it breaks windows<div><a href="http://lab.llvm.org:8011/builders/sanitizer-windows/builds/29838/steps/run%20tests/logs/stdio">http://lab.llvm.org:8011/builders/sanitizer-windows/builds/29838/steps/run%20tests/logs/stdio</a><br><div><br></div></div></div><br><div class="gmail_quote"><div dir="ltr">On Fri, Sep 30, 2016 at 6:04 PM Kostya Serebryany via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: kcc<br class="gmail_msg">
Date: Fri Sep 30 19:55:13 2016<br class="gmail_msg">
New Revision: 282994<br class="gmail_msg">
<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=282994&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=282994&view=rev</a><br class="gmail_msg">
Log:<br class="gmail_msg">
[sanitizer-coverage] remove stale code<br class="gmail_msg">
<br class="gmail_msg">
Removed:<br class="gmail_msg">
compiler-rt/trunk/test/asan/TestCases/coverage-pc-buffer.cc<br class="gmail_msg">
Modified:<br class="gmail_msg">
compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc<br class="gmail_msg">
<br class="gmail_msg">
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc?rev=282994&r1=282993&r2=282994&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc?rev=282994&r1=282993&r2=282994&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc (original)<br class="gmail_msg">
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc Fri Sep 30 19:55:13 2016<br class="gmail_msg">
@@ -113,8 +113,6 @@ class CoverageData {<br class="gmail_msg">
uptr *data();<br class="gmail_msg">
uptr size() const;<br class="gmail_msg">
<br class="gmail_msg">
- void SetPcBuffer(uptr* data, uptr length);<br class="gmail_msg">
-<br class="gmail_msg">
private:<br class="gmail_msg">
struct NamedPcRange {<br class="gmail_msg">
const char *copied_module_name;<br class="gmail_msg">
@@ -145,9 +143,6 @@ class CoverageData {<br class="gmail_msg">
// Descriptor of the file mapped pc array.<br class="gmail_msg">
fd_t pc_fd;<br class="gmail_msg">
<br class="gmail_msg">
- uptr *pc_buffer;<br class="gmail_msg">
- uptr pc_buffer_len;<br class="gmail_msg">
-<br class="gmail_msg">
// Vector of coverage guard arrays, protected by mu.<br class="gmail_msg">
InternalMmapVectorNoCtor<s32*> guard_array_vec;<br class="gmail_msg">
<br class="gmail_msg">
@@ -219,9 +214,6 @@ void CoverageData::Enable() {<br class="gmail_msg">
atomic_store(&pc_array_size, kPcArrayMaxSize, memory_order_relaxed);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
- pc_buffer = nullptr;<br class="gmail_msg">
- pc_buffer_len = 0;<br class="gmail_msg">
-<br class="gmail_msg">
cc_array = reinterpret_cast<uptr **>(MmapNoReserveOrDie(<br class="gmail_msg">
sizeof(uptr *) * kCcArrayMaxSize, "CovInit::cc_array"));<br class="gmail_msg">
atomic_store(&cc_array_size, kCcArrayMaxSize, memory_order_relaxed);<br class="gmail_msg">
@@ -427,7 +419,6 @@ void CoverageData::Add(uptr pc, u32 *gua<br class="gmail_msg">
atomic_load(&pc_array_size, memory_order_acquire));<br class="gmail_msg">
uptr counter = atomic_fetch_add(&coverage_counter, 1, memory_order_relaxed);<br class="gmail_msg">
pc_array[idx] = BundlePcAndCounter(pc, counter);<br class="gmail_msg">
- if (pc_buffer && counter < pc_buffer_len) pc_buffer[counter] = pc;<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
// Registers a pair caller=>callee.<br class="gmail_msg">
@@ -881,11 +872,6 @@ void CoverageData::DumpAll() {<br class="gmail_msg">
DumpCallerCalleePairs();<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-void CoverageData::SetPcBuffer(uptr* data, uptr length) {<br class="gmail_msg">
- pc_buffer = data;<br class="gmail_msg">
- pc_buffer_len = length;<br class="gmail_msg">
-}<br class="gmail_msg">
-<br class="gmail_msg">
void CovPrepareForSandboxing(__sanitizer_sandbox_arguments *args) {<br class="gmail_msg">
if (!args) return;<br class="gmail_msg">
if (!coverage_enabled) return;<br class="gmail_msg">
@@ -1021,16 +1007,6 @@ uptr __sanitizer_get_coverage_guards(upt<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
SANITIZER_INTERFACE_ATTRIBUTE<br class="gmail_msg">
-void __sanitizer_set_coverage_pc_buffer(uptr *data, uptr length) {<br class="gmail_msg">
- coverage_data.SetPcBuffer(data, length);<br class="gmail_msg">
-}<br class="gmail_msg">
-<br class="gmail_msg">
-SANITIZER_INTERFACE_ATTRIBUTE<br class="gmail_msg">
-uptr __sanitizer_get_coverage_pc_buffer_pos() {<br class="gmail_msg">
- return __sanitizer_get_total_unique_coverage();<br class="gmail_msg">
-}<br class="gmail_msg">
-<br class="gmail_msg">
-SANITIZER_INTERFACE_ATTRIBUTE<br class="gmail_msg">
uptr __sanitizer_get_number_of_counters() {<br class="gmail_msg">
return coverage_data.GetNumberOf8bitCounters();<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
Removed: compiler-rt/trunk/test/asan/TestCases/coverage-pc-buffer.cc<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/coverage-pc-buffer.cc?rev=282993&view=auto" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/coverage-pc-buffer.cc?rev=282993&view=auto</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- compiler-rt/trunk/test/asan/TestCases/coverage-pc-buffer.cc (original)<br class="gmail_msg">
+++ compiler-rt/trunk/test/asan/TestCases/coverage-pc-buffer.cc (removed)<br class="gmail_msg">
@@ -1,49 +0,0 @@<br class="gmail_msg">
-// Test __sanitizer_coverage_pc_buffer().<br class="gmail_msg">
-<br class="gmail_msg">
-// RUN: %clangxx_asan -fsanitize-coverage=edge %stdcxx11 %s -O3 -o %t && %run %t<br class="gmail_msg">
-<br class="gmail_msg">
-// UNSUPPORTED: android<br class="gmail_msg">
-<br class="gmail_msg">
-#include <assert.h><br class="gmail_msg">
-#include <memory><br class="gmail_msg">
-#include <sanitizer/coverage_interface.h><br class="gmail_msg">
-#include <stdint.h><br class="gmail_msg">
-#include <stdio.h><br class="gmail_msg">
-<br class="gmail_msg">
-static volatile int sink;<br class="gmail_msg">
-__attribute__((noinline)) void foo() { sink = 1; }<br class="gmail_msg">
-<br class="gmail_msg">
-void assertNotZeroPcs(uintptr_t *buf, uintptr_t size) {<br class="gmail_msg">
- assert(buf);<br class="gmail_msg">
- for (uintptr_t i = 0; i < size; ++i)<br class="gmail_msg">
- assert(buf[i]);<br class="gmail_msg">
-}<br class="gmail_msg">
-<br class="gmail_msg">
-int main() {<br class="gmail_msg">
- uintptr_t buf_size = 1 << 20;<br class="gmail_msg">
- std::unique_ptr<uintptr_t[]> buf(new uintptr_t[buf_size]);<br class="gmail_msg">
- __sanitizer_set_coverage_pc_buffer(buf.get(), buf_size);<br class="gmail_msg">
-<br class="gmail_msg">
- {<br class="gmail_msg">
- uintptr_t sz = __sanitizer_get_coverage_pc_buffer_pos();<br class="gmail_msg">
- assertNotZeroPcs(buf.get(), sz);<br class="gmail_msg">
- assert(sz);<br class="gmail_msg">
- }<br class="gmail_msg">
-<br class="gmail_msg">
- {<br class="gmail_msg">
- uintptr_t sz = __sanitizer_get_coverage_pc_buffer_pos();<br class="gmail_msg">
- foo();<br class="gmail_msg">
- uintptr_t sz1 = __sanitizer_get_coverage_pc_buffer_pos();<br class="gmail_msg">
- assertNotZeroPcs(buf.get(), sz1);<br class="gmail_msg">
- assert(sz1 > sz);<br class="gmail_msg">
- }<br class="gmail_msg">
-<br class="gmail_msg">
- {<br class="gmail_msg">
- uintptr_t sz = __sanitizer_get_coverage_pc_buffer_pos();<br class="gmail_msg">
- // reset coverage to 0.<br class="gmail_msg">
- __sanitizer_reset_coverage();<br class="gmail_msg">
- uintptr_t sz1 = __sanitizer_get_coverage_pc_buffer_pos();<br class="gmail_msg">
- assertNotZeroPcs(buf.get(), sz1);<br class="gmail_msg">
- assert(sz1 < sz);<br class="gmail_msg">
- }<br class="gmail_msg">
-}<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
llvm-commits mailing list<br class="gmail_msg">
<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
</blockquote></div>