diff options
4 files changed, 8 insertions, 0 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_coverage_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_coverage_libcdep.cc index e28a6aee375..eb69172c76b 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_coverage_libcdep.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_coverage_libcdep.cc @@ -509,6 +509,7 @@ static void CovDump() { if (atomic_fetch_add(&dump_once_guard, 1, memory_order_relaxed)) return; CovDumpAsBitSet(); + if (!common_flags()->coverage_pcs) return; uptr size = coverage_data.size(); InternalMmapVector<u32> offsets(size); uptr *vb = coverage_data.data(); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc b/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc index 7cc5cfecc94..3b1ec70fbc8 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc @@ -63,6 +63,7 @@ void CommonFlags::SetDefaults() { legacy_pthread_cond = false; intercept_tls_get_addr = false; coverage = false; + coverage_pcs = true; // On by default, but works only if coverage==true. coverage_bitset = false; coverage_direct = SANITIZER_ANDROID; coverage_dir = "."; @@ -151,6 +152,9 @@ void CommonFlags::ParseFromString(const char *str) { ParseFlag(str, &coverage, "coverage", "If set, coverage information will be dumped at program shutdown (if the " "coverage instrumentation was enabled at compile time)."); + ParseFlag(str, &coverage_pcs, "coverage_pcs", + "If set (and if 'coverage' is set too), the coverage information " + "will be dumped as a set of PC offsets for every module."); ParseFlag(str, &coverage_bitset, "coverage_bitset", "If set (and if 'coverage' is set too), the coverage information " "will also be dumped as a bitset to a separate file."); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_flags.h b/compiler-rt/lib/sanitizer_common/sanitizer_flags.h index 6d251b40ec1..8718089ae19 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_flags.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_flags.h @@ -56,6 +56,7 @@ struct CommonFlags { uptr mmap_limit_mb; uptr hard_rss_limit_mb; bool coverage; + bool coverage_pcs; bool coverage_bitset; bool coverage_direct; const char *coverage_dir; diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-levels.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-levels.cc index d187d36dcba..cc196c5a9e1 100644 --- a/compiler-rt/test/asan/TestCases/Linux/coverage-levels.cc +++ b/compiler-rt/test/asan/TestCases/Linux/coverage-levels.cc @@ -9,6 +9,7 @@ // RUN: ASAN_OPTIONS=coverage=1:coverage_bitset=0:verbosity=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK3_NOBITSET // RUN: ASAN_OPTIONS=coverage=1:verbosity=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK3_NOBITSET +// RUN: ASAN_OPTIONS=coverage=1:coverage_pcs=0:verbosity=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK3_NOPCS // // REQUIRES: asan-64-bits @@ -25,3 +26,4 @@ int main(int argc, char **argv) { // CHECK3: CovDump: bitset of 4 bits written, 3 bits are set // CHECK3: 3 PCs written // CHECK3_NOBITSET-NOT: bitset of +// CHECK3_NOPCS-NOT: PCs written |
