From 49a68258f59b277610ec454be99f84f5181ddde9 Mon Sep 17 00:00:00 2001 From: Mike Aizatsky Date: Wed, 6 Apr 2016 23:24:16 +0000 Subject: [PATCH] [sancov] enabling coverage edge pruning by default. Differential Revision: http://reviews.llvm.org/D18845 llvm-svn: 265614 --- compiler-rt/test/asan/TestCases/Posix/coverage-sandboxing.cc | 4 ++-- compiler-rt/test/asan/TestCases/coverage-levels.cc | 10 +++++----- compiler-rt/test/asan/TestCases/coverage-pc-buffer.cc | 2 +- compiler-rt/test/msan/coverage-levels.cc | 4 ++-- compiler-rt/test/ubsan/TestCases/Misc/coverage-levels.cc | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler-rt/test/asan/TestCases/Posix/coverage-sandboxing.cc b/compiler-rt/test/asan/TestCases/Posix/coverage-sandboxing.cc index f6fc526..c4e6bc7 100644 --- a/compiler-rt/test/asan/TestCases/Posix/coverage-sandboxing.cc +++ b/compiler-rt/test/asan/TestCases/Posix/coverage-sandboxing.cc @@ -79,8 +79,8 @@ int main(int argc, char **argv) { #endif // CHECK-vanilla: PID: [[PID:[0-9]+]] -// CHECK-vanilla: .so.[[PID]].sancov: 258 PCs written +// CHECK-vanilla: .so.[[PID]].sancov: 257 PCs written // CHECK-vanilla: [[PID]].sancov: 1 PCs written // CHECK-sandbox: PID: [[PID:[0-9]+]] -// CHECK-sandbox: 258 PCs written to packed file +// CHECK-sandbox: 257 PCs written to packed file diff --git a/compiler-rt/test/asan/TestCases/coverage-levels.cc b/compiler-rt/test/asan/TestCases/coverage-levels.cc index 612bbd8..83f7cf6 100644 --- a/compiler-rt/test/asan/TestCases/coverage-levels.cc +++ b/compiler-rt/test/asan/TestCases/coverage-levels.cc @@ -25,10 +25,10 @@ int main(int argc, char **argv) { // CHECK1: CovDump: bitset of 1 bits written for '{{.*}}', 1 bits are set // CHECK1: 1 PCs written -// CHECK2: CovDump: bitset of 3 bits written for '{{.*}}', 2 bits are set -// CHECK2: 2 PCs written -// CHECK3: CovDump: bitset of 4 bits written for '{{.*}}', 3 bits are set -// CHECK3: 3 PCs written +// CHECK2: CovDump: bitset of 2 bits written for '{{.*}}', 1 bits are set +// CHECK2: 1 PCs written +// CHECK3: CovDump: bitset of 3 bits written for '{{.*}}', 2 bits are set +// CHECK3: 2 PCs written // CHECK3_NOBITSET-NOT: bitset of // CHECK3_NOPCS-NOT: PCs written -// CHECK_COUNTERS: CovDump: 4 counters written for +// CHECK_COUNTERS: CovDump: 3 counters written for diff --git a/compiler-rt/test/asan/TestCases/coverage-pc-buffer.cc b/compiler-rt/test/asan/TestCases/coverage-pc-buffer.cc index 67b6935..36fde82 100644 --- a/compiler-rt/test/asan/TestCases/coverage-pc-buffer.cc +++ b/compiler-rt/test/asan/TestCases/coverage-pc-buffer.cc @@ -37,7 +37,7 @@ int main() { uintptr_t sz2 = __sanitizer_get_coverage_pc_buffer(&buf2); assertNotZeroPcs(buf2, sz2); assert(buf2 == buf); - assert(sz2 > sz1); + assert(sz2 == sz1); __sanitizer_reset_coverage(); uintptr_t *buf3 = NULL; diff --git a/compiler-rt/test/msan/coverage-levels.cc b/compiler-rt/test/msan/coverage-levels.cc index d71bfec..710a69a 100644 --- a/compiler-rt/test/msan/coverage-levels.cc +++ b/compiler-rt/test/msan/coverage-levels.cc @@ -24,5 +24,5 @@ int main(int argc, char **argv) { // CHECK_WARN: WARNING: MemorySanitizer: use-of-uninitialized-value // CHECK_NOWARN-NOT: ERROR // CHECK1: 1 PCs written -// CHECK2: 2 PCs written -// CHECK3: 3 PCs written +// CHECK2: 1 PCs written +// CHECK3: 2 PCs written diff --git a/compiler-rt/test/ubsan/TestCases/Misc/coverage-levels.cc b/compiler-rt/test/ubsan/TestCases/Misc/coverage-levels.cc index 8657f74..bc973c4 100644 --- a/compiler-rt/test/ubsan/TestCases/Misc/coverage-levels.cc +++ b/compiler-rt/test/ubsan/TestCases/Misc/coverage-levels.cc @@ -37,5 +37,5 @@ int main(int argc, char **argv) { // FIXME: Currently, ubsan with -fno-sanitize-recover and w/o asan will fail // to dump coverage. // CHECK1: 1 PCs written -// CHECK2: 3 PCs written -// CHECK3: 3 PCs written +// CHECK2: 2 PCs written +// CHECK3: 2 PCs written -- 2.7.4