Merge branch 'users/chapuni/cov/single/base' into users/chapuni/cov/single/if

Conflicts:
	clang/test/CoverageMapping/single-byte-counters.cpp

Author: chapuni

llvm/lib/ProfileData/Coverage/CoverageMapping.cpp

@@ -637,8 +637,7 @@ static unsigned getMaxCounterID(const CounterMappingContext &Ctx,
   unsigned MaxCounterID = 0;
   for (const auto &Region : Record.MappingRegions) {
     MaxCounterID = std::max(MaxCounterID, Ctx.getMaxCounterID(Region.Count));
-    if (Region.Kind == CounterMappingRegion::BranchRegion ||
-        Region.Kind == CounterMappingRegion::MCDCBranchRegion)
+    if (Region.isBranch())
       MaxCounterID =
           std::max(MaxCounterID, Ctx.getMaxCounterID(Region.FalseCount));
   }