[compiler-rt] r282994 - [sanitizer-coverage] remove stale code

[Kostya Serebryany via llvm-commits]

Thanks!
I hope r283185 does this right.

--kcc

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