Index: compiler-rt/trunk/test/asan/TestCases/Posix/coverage-sandboxing.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/Posix/coverage-sandboxing.cc
+++ compiler-rt/trunk/test/asan/TestCases/Posix/coverage-sandboxing.cc
@@ -79,8 +79,8 @@
 #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
Index: compiler-rt/trunk/test/asan/TestCases/coverage-levels.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/coverage-levels.cc
+++ compiler-rt/trunk/test/asan/TestCases/coverage-levels.cc
@@ -25,10 +25,10 @@
 
 // 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
Index: compiler-rt/trunk/test/asan/TestCases/coverage-pc-buffer.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/coverage-pc-buffer.cc
+++ compiler-rt/trunk/test/asan/TestCases/coverage-pc-buffer.cc
@@ -37,7 +37,7 @@
   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;
Index: compiler-rt/trunk/test/msan/coverage-levels.cc
===================================================================
--- compiler-rt/trunk/test/msan/coverage-levels.cc
+++ compiler-rt/trunk/test/msan/coverage-levels.cc
@@ -24,5 +24,5 @@
 // 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
Index: compiler-rt/trunk/test/ubsan/TestCases/Misc/coverage-levels.cc
===================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/Misc/coverage-levels.cc
+++ compiler-rt/trunk/test/ubsan/TestCases/Misc/coverage-levels.cc
@@ -37,5 +37,5 @@
 // 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