[BOLT][NFC] Use llvm::make_range

[Amir]

Summary

Use llvm::make_range convenience wrapper from ADT.

[rafauler]

LGTM

[Amir]

Fix multimap erase

[Amir]

Remove multimap erase changes

bolt/lib/Profile/DataAggregator.cpp

while (hasData()) {
     if (std::error_code EC = FileMMapInfoRes.getError())
       return EC;
 
     std::pair<StringRef, MMapInfo> FileMMapInfo = FileMMapInfoRes.get();
     if (FileMMapInfo.second.PID == -1)
       continue;
 
     // Consider only the first mapping of the file for any given PID
-    bool PIDExists = false;
     auto Range = GlobalMMapInfo.equal_range(FileMMapInfo.first);
-    for (auto MI = Range.first; MI != Range.second; ++MI) {
-      if (MI->second.PID == FileMMapInfo.second.PID) {
-        PIDExists = true;
-        break;
-      }
-    }
+    bool PIDExists = llvm::any_of(make_range(Range), [&](const auto &MI) {
+      return MI.second.PID == FileMMapInfo.second.PID;
+    });
+
     if (PIDExists)
       continue;
 
     GlobalMMapInfo.insert(FileMMapInfo);
   }
 
   LLVM_DEBUG({
     dbgs() << "FileName -> mmap info:\n";
     for (const std::pair<const StringRef, MMapInfo> &Pair : GlobalMMapInfo)
       dbgs() << "  " << Pair.first << " : " << Pair.second.PID << " [0x"
              << Twine::utohexstr(Pair.second.MMapAddress) << ", "
              << Twine::utohexstr(Pair.second.Size) << " @ "
              << Twine::utohexstr(Pair.second.Offset) << "]\n";
   });
 
   StringRef NameToUse = llvm::sys::path::filename(BC->getFilename());
   if (GlobalMMapInfo.count(NameToUse) == 0 && !BuildIDBinaryName.empty()) {
     errs() << "PERF2BOLT-WARNING: using \"" << BuildIDBinaryName
            << "\" for profile matching\n";
     NameToUse = BuildIDBinaryName;
   }
 
   auto Range = GlobalMMapInfo.equal_range(NameToUse);
-  for (auto I = Range.first; I != Range.second; ++I) {
-    MMapInfo &MMapInfo = I->second;
+  for (MMapInfo &MMapInfo : llvm::make_second_range(make_range(Range))) {
     if (BC->HasFixedLoadAddress && MMapInfo.MMapAddress) {
       // Check that the binary mapping matches one of the segments.
       bool MatchFound = llvm::any_of(
           llvm::make_second_range(BC->SegmentMapInfo),
           [&](SegmentInfo &SegInfo) {
             // The mapping is page-aligned and hence the MMapAddress could be
             // different from the segment start address. We cannot know the page
             // size of the mapping, but we know it should not exceed the segment

bolt/lib/Profile/DataReader.cpp

struct Compare {
     bool operator()(const BranchInfo &BI, const uint64_t Val) const {
       return BI.From.Offset < Val;
     }
     bool operator()(const uint64_t Val, const BranchInfo &BI) const {
       return Val < BI.From.Offset;
     }
   };
   auto Range = std::equal_range(Data.begin(), Data.end(), From, Compare());
-  for (auto I = Range.first; I != Range.second; ++I)
-    if (I->From.Name != I->To.Name)
-      return *I;
+  for (const auto &RI : llvm::make_range(Range))
+    if (RI.From.Name != RI.To.Name)
+      return RI;
 
   return make_error_code(llvm::errc::invalid_argument);
 }
 
 void MemInfo::print(raw_ostream &OS) const {
   OS << (Offset.IsSymbol + 3) << " " << Offset.Name << " "
      << Twine::utohexstr(Offset.Offset) << " " << (Addr.IsSymbol + 3) << " "
      << Addr.Name << " " << Twine::utohexstr(Addr.Offset) << " " << Count