llvm-cov: Simplify CounterMappingRegion, pushing logic to its user

A single function in SourceCoverageDataManager was the only user of
some of the comparisons in CounterMappingRegion, and at this point we
know that only one file is relevant. This lets us use slightly simpler
logic directly in the client.

llvm-svn: 217745

1 files changed, 6 insertions, 3 deletions

diff --git a/llvm/tools/llvm-cov/SourceCoverageDataManager.cpp b/llvm/tools/llvm-cov/SourceCoverageDataManager.cpp
index f64162822ab..6f7c8e5d985 100644
--- a/llvm/tools/llvm-cov/SourceCoverageDataManager.cpp
+++ b/llvm/tools/llvm-cov/SourceCoverageDataManager.cpp
@@ -26,13 +26,16 @@ ArrayRef<CountedRegion> SourceCoverageDataManager::getSourceRegions() {
   if (Uniqued || Regions.size() <= 1)
     return Regions;
 
-  // Sort.
-  std::sort(Regions.begin(), Regions.end());
+  // Sort the regions given that they're all in the same file at this point.
+  std::sort(Regions.begin(), Regions.end(),
+            [](const CountedRegion &LHS, const CountedRegion &RHS) {
+    return LHS.startLoc() < RHS.startLoc();
+  });
 
   // Merge duplicate source ranges and sum their execution counts.
   auto Prev = Regions.begin();
   for (auto I = Prev + 1, E = Regions.end(); I != E; ++I) {
-    if (I->coversSameSource(*Prev)) {
+    if (I->startLoc() == Prev->startLoc() && I->endLoc() == Prev->endLoc()) {
       Prev->ExecutionCount += I->ExecutionCount;
       continue;
     }