diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/test/tools/llvm-cov/deferred-region.cpp | 14 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-cov/showRegionMarkers.cpp | 4 | ||||
| -rw-r--r-- | llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp | 2 | ||||
| -rw-r--r-- | llvm/tools/llvm-cov/SourceCoverageViewText.cpp | 2 |
4 files changed, 7 insertions, 15 deletions
diff --git a/llvm/test/tools/llvm-cov/deferred-region.cpp b/llvm/test/tools/llvm-cov/deferred-region.cpp index 012e0f88783..09d9d09a09d 100644 --- a/llvm/test/tools/llvm-cov/deferred-region.cpp +++ b/llvm/test/tools/llvm-cov/deferred-region.cpp @@ -88,35 +88,23 @@ int main() { return 0; } -// MARKER: Marker at 4:7 = 2 -// MARKER-NEXT: Highlighted line 17, 5 -> 11 +// MARKER: Highlighted line 17, 5 -> 11 // MARKER-NEXT: Marker at 19:3 = 1 -// MARKER-NEXT: Marker at 19:19 = 2 // MARKER-NEXT: Marker at 19:27 = 1 -// MARKER-NEXT: Marker at 23:5 = 1 -// MARKER-NEXT: Marker at 23:9 = 1 // MARKER-NEXT: Highlighted line 24, 7 -> 12 // MARKER-NEXT: Highlighted line 36, 5 -> 11 -// MARKER-NEXT: Marker at 39:10 = 3 -// MARKER-NEXT: Marker at 43:5 = 1 -// MARKER-NEXT: Marker at 43:12 = 1 // MARKER-NEXT: Highlighted line 46, 1 -> ? // MARKER-NEXT: Highlighted line 47, 1 -> 7 // MARKER-NEXT: Highlighted line 47, 7 -> 14 // MARKER-NEXT: Highlighted line 47, 14 -> 21 // MARKER-NEXT: Highlighted line 47, 21 -> 23 // MARKER-NEXT: Highlighted line 47, 23 -> 25 -// MARKER-NEXT: Marker at 47:7 = 0 -// MARKER-NEXT: Marker at 47:14 = 0 -// MARKER-NEXT: Marker at 47:23 = 0 // MARKER-NEXT: Highlighted line 51, 7 -> 20 // MARKER-NEXT: Marker at 53:5 = 1 -// MARKER-NEXT: Marker at 53:12 = 6 // MARKER-NEXT: Highlighted line 55, 9 -> 14 // MARKER-NEXT: Highlighted line 63, 5 -> 13 // MARKER-NEXT: Highlighted line 67, 1 -> ? // MARKER-NEXT: Highlighted line 68, 1 -> 8 // MARKER-NEXT: Highlighted line 68, 8 -> ? // MARKER-NEXT: Highlighted line 69, 1 -> 2 -// MARKER-NEXT: Marker at 72:7 = 2 // MARKER-NEXT: Highlighted line 77, 1 -> 2 diff --git a/llvm/test/tools/llvm-cov/showRegionMarkers.cpp b/llvm/test/tools/llvm-cov/showRegionMarkers.cpp index b9e9f5c8df9..c6d1690cc10 100644 --- a/llvm/test/tools/llvm-cov/showRegionMarkers.cpp +++ b/llvm/test/tools/llvm-cov/showRegionMarkers.cpp @@ -8,12 +8,12 @@ int main() { // CHECK-NOT: Marker at [[@LINE]]:12 } else { // CHECK-NOT: Marker at [[@LINE]]:10 x = 1; } - // CHECK: Marker at [[@LINE+2]]:19 = 112M + // CHECK-NOT: Marker at [[@LINE+2]]:19 // CHECK: Marker at [[@LINE+1]]:28 = 111M for (int i = 0; i < 100; ++i) { // CHECK-NOT: Marker at [[@LINE]]:33 x = 1; } - // CHECK: Marker at [[@LINE+1]]:16 = 1.11M + // CHECK-NOT: Marker at [[@LINE+1]]:16 x = x < 10 ? x + 1 : x - 1; // CHECK: Marker at [[@LINE]]:24 = 0 x = x > 10 ? x - 1: // CHECK-NOT: Marker at [[@LINE]]:9 diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp index 626016f0e49..4900ad4bf5e 100644 --- a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp @@ -563,6 +563,8 @@ void SourceCoverageViewHTML::renderLine(raw_ostream &OS, LineRef L, const auto *CurSeg = Segments[I]; if (!CurSeg->IsRegionEntry) continue; + if (CurSeg->Count == LCS.getExecutionCount()) + continue; Snippets[I + 1] = tag("div", Snippets[I + 1] + tag("span", formatCount(CurSeg->Count), diff --git a/llvm/tools/llvm-cov/SourceCoverageViewText.cpp b/llvm/tools/llvm-cov/SourceCoverageViewText.cpp index 83d228e3670..2ed16dfbc69 100644 --- a/llvm/tools/llvm-cov/SourceCoverageViewText.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageViewText.cpp @@ -186,6 +186,8 @@ void SourceCoverageViewText::renderRegionMarkers(raw_ostream &OS, for (const auto *S : Segments) { if (!S->IsRegionEntry) continue; + if (S->Count == Line.getExecutionCount()) + continue; // Skip to the new region. if (S->Col > PrevColumn) OS.indent(S->Col - PrevColumn); |
