Skip to content

Commit ca53611

Browse files
[llvm] Use range-based for loops (NFC) (#105861)
1 parent cdd11d6 commit ca53611

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

llvm/include/llvm/IR/ModuleSummaryIndex.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,9 +1808,9 @@ class ModuleSummaryIndex {
18081808
/// the ThinLTO backends.
18091809
TypeIdSummary &getOrInsertTypeIdSummary(StringRef TypeId) {
18101810
auto TidIter = TypeIdMap.equal_range(GlobalValue::getGUID(TypeId));
1811-
for (auto It = TidIter.first; It != TidIter.second; ++It)
1812-
if (It->second.first == TypeId)
1813-
return It->second.second;
1811+
for (auto &[GUID, TypeIdPair] : make_range(TidIter))
1812+
if (TypeIdPair.first == TypeId)
1813+
return TypeIdPair.second;
18141814
auto It = TypeIdMap.insert(
18151815
{GlobalValue::getGUID(TypeId), {std::string(TypeId), TypeIdSummary()}});
18161816
return It->second.second;
@@ -1820,9 +1820,9 @@ class ModuleSummaryIndex {
18201820
/// summary map) or null (if not present). This may be used when importing.
18211821
const TypeIdSummary *getTypeIdSummary(StringRef TypeId) const {
18221822
auto TidIter = TypeIdMap.equal_range(GlobalValue::getGUID(TypeId));
1823-
for (auto It = TidIter.first; It != TidIter.second; ++It)
1824-
if (It->second.first == TypeId)
1825-
return &It->second.second;
1823+
for (const auto &[GUID, TypeIdPair] : make_range(TidIter))
1824+
if (TypeIdPair.first == TypeId)
1825+
return &TypeIdPair.second;
18261826
return nullptr;
18271827
}
18281828

llvm/lib/Bitcode/Writer/BitcodeWriter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4807,9 +4807,9 @@ void IndexBitcodeWriter::writeCombinedGlobalValueSummary() {
48074807
// corresponding type id records.
48084808
for (auto &T : ReferencedTypeIds) {
48094809
auto TidIter = Index.typeIds().equal_range(T);
4810-
for (auto It = TidIter.first; It != TidIter.second; ++It) {
4811-
writeTypeIdSummaryRecord(NameVals, StrtabBuilder, It->second.first,
4812-
It->second.second);
4810+
for (const auto &[GUID, TypeIdPair] : make_range(TidIter)) {
4811+
writeTypeIdSummaryRecord(NameVals, StrtabBuilder, TypeIdPair.first,
4812+
TypeIdPair.second);
48134813
Stream.EmitRecord(bitc::FS_TYPE_ID, NameVals);
48144814
NameVals.clear();
48154815
}

llvm/lib/CodeGen/LiveDebugValues/VarLocBasedImpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,7 @@ void VarLocBasedLDV::cleanupEntryValueTransfers(
13121312
return;
13131313

13141314
auto TransRange = EntryValTransfers.equal_range(TRInst);
1315-
for (auto &TDPair : llvm::make_range(TransRange.first, TransRange.second)) {
1315+
for (auto &TDPair : llvm::make_range(TransRange)) {
13161316
const VarLoc &EmittedEV = VarLocIDs[TDPair.second];
13171317
if (std::tie(EntryVL.Var, EntryVL.Locs[0].Value.RegNo, EntryVL.Expr) ==
13181318
std::tie(EmittedEV.Var, EmittedEV.Locs[0].Value.RegNo,

llvm/lib/IR/AsmWriter.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3488,9 +3488,9 @@ void AssemblyWriter::printTypeIdInfo(
34883488
continue;
34893489
}
34903490
// Print all type id that correspond to this GUID.
3491-
for (auto It = TidIter.first; It != TidIter.second; ++It) {
3491+
for (const auto &[GUID, TypeIdPair] : make_range(TidIter)) {
34923492
Out << FS;
3493-
auto Slot = Machine.getTypeIdSlot(It->second.first);
3493+
auto Slot = Machine.getTypeIdSlot(TypeIdPair.first);
34943494
assert(Slot != -1);
34953495
Out << "^" << Slot;
34963496
}
@@ -3529,10 +3529,10 @@ void AssemblyWriter::printVFuncId(const FunctionSummary::VFuncId VFId) {
35293529
}
35303530
// Print all type id that correspond to this GUID.
35313531
FieldSeparator FS;
3532-
for (auto It = TidIter.first; It != TidIter.second; ++It) {
3532+
for (const auto &[GUID, TypeIdPair] : make_range(TidIter)) {
35333533
Out << FS;
35343534
Out << "vFuncId: (";
3535-
auto Slot = Machine.getTypeIdSlot(It->second.first);
3535+
auto Slot = Machine.getTypeIdSlot(TypeIdPair.first);
35363536
assert(Slot != -1);
35373537
Out << "^" << Slot;
35383538
Out << ", offset: " << VFId.Offset;

llvm/tools/llvm-profgen/ProfiledBinary.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,8 @@ void ProfiledBinary::decodePseudoProbe(const ELFObjectFileBase *Obj) {
423423
GuidFilter.insert(Function::getGUID(F->FuncName));
424424
for (auto &Range : F->Ranges) {
425425
auto GUIDs = StartAddrToSymMap.equal_range(Range.first);
426-
for (auto I = GUIDs.first; I != GUIDs.second; ++I)
427-
FuncStartAddresses[I->second] = I->first;
426+
for (const auto &[StartAddr, Func] : make_range(GUIDs))
427+
FuncStartAddresses[Func] = StartAddr;
428428
}
429429
}
430430
}

0 commit comments

Comments
 (0)