[llvm-cov] Remove workaround in line execution count calculation (PR34962)

Gap areas make it possible to correctly determine when to use counts
from deferred regions. Before gap areas were introduced, llvm-cov needed
to use a heuristic to do this: it ignored counts from segments that
start, but do not end, on a line. This heuristic breaks down on a simple
example (see PR34962).

This patch removes the heuristic and picks counts from any region entry
segment which isn't a gap area.

llvm-svn: 315960

3 files changed, 12 insertions, 0 deletions

diff --git a/llvm/test/tools/llvm-cov/Inputs/deferred-regions.covmapping b/llvm/test/tools/llvm-cov/Inputs/deferred-regions.covmapping
index 4434b66513c..d16db88acbe 100644
--- a/llvm/test/tools/llvm-cov/Inputs/deferred-regions.covmapping
+++ b/llvm/test/tools/llvm-cov/Inputs/deferred-regions.covmapping
diff --git a/llvm/test/tools/llvm-cov/Inputs/deferred-regions.profdata b/llvm/test/tools/llvm-cov/Inputs/deferred-regions.profdata
index 0bacac01ccf..423f1f07cb8 100644
--- a/llvm/test/tools/llvm-cov/Inputs/deferred-regions.profdata
+++ b/llvm/test/tools/llvm-cov/Inputs/deferred-regions.profdata
diff --git a/llvm/test/tools/llvm-cov/deferred-region.cpp b/llvm/test/tools/llvm-cov/deferred-region.cpp
index 6f6da7ec804..37a6ae4825c 100644
--- a/llvm/test/tools/llvm-cov/deferred-region.cpp
+++ b/llvm/test/tools/llvm-cov/deferred-region.cpp
@@ -68,6 +68,14 @@ out: // CHECK: [[@LINE]]|{{ +}}0|
 	return;
 }
 
+void if_else(bool flag) {
+  if (flag) { // CHECK: [[@LINE]]|{{ +}}2|
+    return;   // CHECK: [[@LINE]]|{{ +}}1|
+  } else {    // CHECK: [[@LINE]]|{{ +}}2|
+    return;   // CHECK: [[@LINE]]|{{ +}}1|
+  }           // CHECK: [[@LINE]]|{{ +}}1|
+}
+
 int main() {
   foo(0);
   foo(1);
@@ -75,6 +83,8 @@ int main() {
   for_loop();
   while_loop();
   gotos();
+  if_else(true);
+  if_else(false);
   return 0;
 }
 
@@ -107,3 +117,5 @@ int main() {
 // MARKER-NEXT: Highlighted line 67, 1 -> ?
 // MARKER-NEXT: Highlighted line 68, 1 -> 8
 // MARKER-NEXT: Highlighted line 69, 1 -> 2
+// MARKER-NEXT: Marker at 72:7 = 2
+// MARKER-NEXT: Highlighted line 77, 1 -> 2