[Coverage] Simplify r316141. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@316147 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 9 insertions, 44 deletions

diff --git a/lib/ProfileData/Coverage/CoverageMapping.cpp b/lib/ProfileData/Coverage/CoverageMapping.cpp
index bda61768e7b..5542cc89f6b 100644
--- a/lib/ProfileData/Coverage/CoverageMapping.cpp
+++ b/lib/ProfileData/Coverage/CoverageMapping.cpp
@@ -672,13 +672,13 @@ CoverageData CoverageMapping::getCoverageForExpansion(
 }
 
 LineCoverageStats::LineCoverageStats(
-    ArrayRef<const coverage::CoverageSegment *> LineSegments,
-    const coverage::CoverageSegment *WrappedSegment, unsigned Line)
+    ArrayRef<const CoverageSegment *> LineSegments,
+    const CoverageSegment *WrappedSegment, unsigned Line)
     : ExecutionCount(0), HasMultipleRegions(false), Mapped(false), Line(Line),
       LineSegments(LineSegments), WrappedSegment(WrappedSegment) {
   // Find the minimum number of regions which start in this line.
   unsigned MinRegionCount = 0;
-  auto isStartOfRegion = [](const coverage::CoverageSegment *S) {
+  auto isStartOfRegion = [](const CoverageSegment *S) {
     return !S->IsGapRegion && S->HasCount && S->IsRegionEntry;
   };
   for (unsigned I = 0; I < LineSegments.size() && MinRegionCount < 2; ++I)
diff --git a/unittests/ProfileData/CoverageMappingTest.cpp b/unittests/ProfileData/CoverageMappingTest.cpp
index ad0a0cfb873..ce52c6f93ee 100644
--- a/unittests/ProfileData/CoverageMappingTest.cpp
+++ b/unittests/ProfileData/CoverageMappingTest.cpp
@@ -647,49 +647,14 @@ TEST_P(CoverageMappingTest, test_line_coverage_iterator) {
 
   CoverageData Data = LoadedCoverage->getCoverageForFile("file1");
 
-  unsigned NumLineStats = 0;
+  unsigned Line = 0;
+  unsigned LineCounts[] = {20, 20, 20, 20, 10, 10, 10, 10, 10, 0, 0};
   for (const auto &LCS : getLineCoverageStats(Data)) {
-    ++NumLineStats;
-    (void)LCS;
+    ASSERT_EQ(Line + 1, LCS.getLine());
+    ASSERT_EQ(LineCounts[Line], LCS.getExecutionCount());
+    ++Line;
   }
-  ASSERT_EQ(11U, NumLineStats);
-
-  LineCoverageIterator LCI{Data};
-
-  ASSERT_EQ(1U, LCI->getLine());
-  ASSERT_EQ(20ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(2U, LCI->getLine());
-  ASSERT_EQ(20ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(3U, LCI->getLine());
-  ASSERT_EQ(20ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(4U, LCI->getLine());
-  ASSERT_EQ(20ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(5U, LCI->getLine());
-  ASSERT_EQ(10ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(6U, LCI->getLine());
-  ASSERT_EQ(10ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(7U, LCI->getLine());
-  ASSERT_EQ(10ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(8U, LCI->getLine());
-  ASSERT_EQ(10ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(9U, LCI->getLine());
-  ASSERT_EQ(10ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(10U, LCI->getLine());
-  ASSERT_EQ(0ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(11U, LCI->getLine());
-  ASSERT_EQ(0ULL, LCI->getExecutionCount());
-  ++LCI;
-  ASSERT_EQ(LCI, LCI.getEnd());
+  ASSERT_EQ(11U, Line);
 }
 
 TEST_P(CoverageMappingTest, uncovered_function) {