diff options
author | Amir Ayupov <aaupov@fb.com> | 2023-05-16 13:57:41 -0700 |
---|---|---|
committer | Amir Ayupov <aaupov@fb.com> | 2023-05-17 10:50:56 -0700 |
commit | 17f3cbe3af8186762061ab93e86345227bc7ba1c (patch) | |
tree | a2b0d2f278fb16dbee0a6c7d956051799bf32b09 | |
parent | b9e5dacc0dd647375f7f44ee5f2b0d368f7289e0 (diff) | |
download | llvm-17f3cbe3af8186762061ab93e86345227bc7ba1c.tar.gz |
[BOLT][NFC] Use llvm::make_range
Use `llvm::make_range` convenience wrapper from ADT.
Reviewed By: #bolt, rafauler
Differential Revision: https://reviews.llvm.org/D145887
-rw-r--r-- | bolt/lib/Profile/DataAggregator.cpp | 14 | ||||
-rw-r--r-- | bolt/lib/Profile/DataReader.cpp | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/bolt/lib/Profile/DataAggregator.cpp b/bolt/lib/Profile/DataAggregator.cpp index 7d72c3b0e372..46631e06eb54 100644 --- a/bolt/lib/Profile/DataAggregator.cpp +++ b/bolt/lib/Profile/DataAggregator.cpp @@ -1983,14 +1983,11 @@ std::error_code DataAggregator::parseMMapEvents() { 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; @@ -2014,8 +2011,7 @@ std::error_code DataAggregator::parseMMapEvents() { } 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( diff --git a/bolt/lib/Profile/DataReader.cpp b/bolt/lib/Profile/DataReader.cpp index edc4bf977f21..0e12e8cb3070 100644 --- a/bolt/lib/Profile/DataReader.cpp +++ b/bolt/lib/Profile/DataReader.cpp @@ -215,9 +215,9 @@ FuncBranchData::getDirectCallBranch(uint64_t From) const { } }; 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); } |