[llvm] [llvm] Use range-based for loops (NFC) (PR #105861)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 23 14:53:45 PDT 2024
https://github.com/kazutakahirata updated https://github.com/llvm/llvm-project/pull/105861
>From 8f3ad5784e5ee3f7a895bfedb788da54cab166e9 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Fri, 23 Aug 2024 09:40:37 -0700
Subject: [PATCH 1/2] [llvm] Use range-based for loops (NFC)
---
llvm/include/llvm/IR/ModuleSummaryIndex.h | 12 ++++++------
llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 6 +++---
llvm/lib/CodeGen/LiveDebugValues/VarLocBasedImpl.cpp | 2 +-
llvm/lib/IR/AsmWriter.cpp | 8 ++++----
llvm/tools/llvm-profgen/ProfiledBinary.cpp | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/llvm/include/llvm/IR/ModuleSummaryIndex.h b/llvm/include/llvm/IR/ModuleSummaryIndex.h
index 00934cc1ce6f2d..22a6cba7c89464 100644
--- a/llvm/include/llvm/IR/ModuleSummaryIndex.h
+++ b/llvm/include/llvm/IR/ModuleSummaryIndex.h
@@ -1808,9 +1808,9 @@ class ModuleSummaryIndex {
/// the ThinLTO backends.
TypeIdSummary &getOrInsertTypeIdSummary(StringRef TypeId) {
auto TidIter = TypeIdMap.equal_range(GlobalValue::getGUID(TypeId));
- for (auto It = TidIter.first; It != TidIter.second; ++It)
- if (It->second.first == TypeId)
- return It->second.second;
+ for (auto &KV : make_range(TidIter))
+ if (KV.second.first == TypeId)
+ return KV.second.second;
auto It = TypeIdMap.insert(
{GlobalValue::getGUID(TypeId), {std::string(TypeId), TypeIdSummary()}});
return It->second.second;
@@ -1820,9 +1820,9 @@ class ModuleSummaryIndex {
/// summary map) or null (if not present). This may be used when importing.
const TypeIdSummary *getTypeIdSummary(StringRef TypeId) const {
auto TidIter = TypeIdMap.equal_range(GlobalValue::getGUID(TypeId));
- for (auto It = TidIter.first; It != TidIter.second; ++It)
- if (It->second.first == TypeId)
- return &It->second.second;
+ for (const auto &KV : make_range(TidIter))
+ if (KV.second.first == TypeId)
+ return &KV.second.second;
return nullptr;
}
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
index 03d0537291dada..cd8f9033c62a02 100644
--- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -4807,9 +4807,9 @@ void IndexBitcodeWriter::writeCombinedGlobalValueSummary() {
// corresponding type id records.
for (auto &T : ReferencedTypeIds) {
auto TidIter = Index.typeIds().equal_range(T);
- for (auto It = TidIter.first; It != TidIter.second; ++It) {
- writeTypeIdSummaryRecord(NameVals, StrtabBuilder, It->second.first,
- It->second.second);
+ for (const auto &KV : make_range(TidIter)) {
+ writeTypeIdSummaryRecord(NameVals, StrtabBuilder, KV.second.first,
+ KV.second.second);
Stream.EmitRecord(bitc::FS_TYPE_ID, NameVals);
NameVals.clear();
}
diff --git a/llvm/lib/CodeGen/LiveDebugValues/VarLocBasedImpl.cpp b/llvm/lib/CodeGen/LiveDebugValues/VarLocBasedImpl.cpp
index e146fb7e576819..2959d3261bea71 100644
--- a/llvm/lib/CodeGen/LiveDebugValues/VarLocBasedImpl.cpp
+++ b/llvm/lib/CodeGen/LiveDebugValues/VarLocBasedImpl.cpp
@@ -1312,7 +1312,7 @@ void VarLocBasedLDV::cleanupEntryValueTransfers(
return;
auto TransRange = EntryValTransfers.equal_range(TRInst);
- for (auto &TDPair : llvm::make_range(TransRange.first, TransRange.second)) {
+ for (auto &TDPair : llvm::make_range(TransRange)) {
const VarLoc &EmittedEV = VarLocIDs[TDPair.second];
if (std::tie(EntryVL.Var, EntryVL.Locs[0].Value.RegNo, EntryVL.Expr) ==
std::tie(EmittedEV.Var, EmittedEV.Locs[0].Value.RegNo,
diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp
index 01a16ccd688f43..1b569715345cca 100644
--- a/llvm/lib/IR/AsmWriter.cpp
+++ b/llvm/lib/IR/AsmWriter.cpp
@@ -3488,9 +3488,9 @@ void AssemblyWriter::printTypeIdInfo(
continue;
}
// Print all type id that correspond to this GUID.
- for (auto It = TidIter.first; It != TidIter.second; ++It) {
+ for (const auto &KV : make_range(TidIter)) {
Out << FS;
- auto Slot = Machine.getTypeIdSlot(It->second.first);
+ auto Slot = Machine.getTypeIdSlot(KV.second.first);
assert(Slot != -1);
Out << "^" << Slot;
}
@@ -3529,10 +3529,10 @@ void AssemblyWriter::printVFuncId(const FunctionSummary::VFuncId VFId) {
}
// Print all type id that correspond to this GUID.
FieldSeparator FS;
- for (auto It = TidIter.first; It != TidIter.second; ++It) {
+ for (const auto &KV : make_range(TidIter)) {
Out << FS;
Out << "vFuncId: (";
- auto Slot = Machine.getTypeIdSlot(It->second.first);
+ auto Slot = Machine.getTypeIdSlot(KV.second.first);
assert(Slot != -1);
Out << "^" << Slot;
Out << ", offset: " << VFId.Offset;
diff --git a/llvm/tools/llvm-profgen/ProfiledBinary.cpp b/llvm/tools/llvm-profgen/ProfiledBinary.cpp
index 574a9c9f52bf18..07966bc92e3933 100644
--- a/llvm/tools/llvm-profgen/ProfiledBinary.cpp
+++ b/llvm/tools/llvm-profgen/ProfiledBinary.cpp
@@ -423,8 +423,8 @@ void ProfiledBinary::decodePseudoProbe(const ELFObjectFileBase *Obj) {
GuidFilter.insert(Function::getGUID(F->FuncName));
for (auto &Range : F->Ranges) {
auto GUIDs = StartAddrToSymMap.equal_range(Range.first);
- for (auto I = GUIDs.first; I != GUIDs.second; ++I)
- FuncStartAddresses[I->second] = I->first;
+ for (const auto &[K, V] : make_range(GUIDs))
+ FuncStartAddresses[V] = K;
}
}
}
>From 3cbfb9de384189235f5dec0e373fc9cba34e2f42 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Fri, 23 Aug 2024 14:52:07 -0700
Subject: [PATCH 2/2] Use structured binding.
---
llvm/include/llvm/IR/ModuleSummaryIndex.h | 12 ++++++------
llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 6 +++---
llvm/lib/IR/AsmWriter.cpp | 8 ++++----
llvm/tools/llvm-profgen/ProfiledBinary.cpp | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/llvm/include/llvm/IR/ModuleSummaryIndex.h b/llvm/include/llvm/IR/ModuleSummaryIndex.h
index 22a6cba7c89464..e3455f02878f03 100644
--- a/llvm/include/llvm/IR/ModuleSummaryIndex.h
+++ b/llvm/include/llvm/IR/ModuleSummaryIndex.h
@@ -1808,9 +1808,9 @@ class ModuleSummaryIndex {
/// the ThinLTO backends.
TypeIdSummary &getOrInsertTypeIdSummary(StringRef TypeId) {
auto TidIter = TypeIdMap.equal_range(GlobalValue::getGUID(TypeId));
- for (auto &KV : make_range(TidIter))
- if (KV.second.first == TypeId)
- return KV.second.second;
+ for (auto &[GUID, TypeIdPair] : make_range(TidIter))
+ if (TypeIdPair.first == TypeId)
+ return TypeIdPair.second;
auto It = TypeIdMap.insert(
{GlobalValue::getGUID(TypeId), {std::string(TypeId), TypeIdSummary()}});
return It->second.second;
@@ -1820,9 +1820,9 @@ class ModuleSummaryIndex {
/// summary map) or null (if not present). This may be used when importing.
const TypeIdSummary *getTypeIdSummary(StringRef TypeId) const {
auto TidIter = TypeIdMap.equal_range(GlobalValue::getGUID(TypeId));
- for (const auto &KV : make_range(TidIter))
- if (KV.second.first == TypeId)
- return &KV.second.second;
+ for (const auto &[GUID, TypeIdPair] : make_range(TidIter))
+ if (TypeIdPair.first == TypeId)
+ return &TypeIdPair.second;
return nullptr;
}
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
index cd8f9033c62a02..a9979ac99f07df 100644
--- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -4807,9 +4807,9 @@ void IndexBitcodeWriter::writeCombinedGlobalValueSummary() {
// corresponding type id records.
for (auto &T : ReferencedTypeIds) {
auto TidIter = Index.typeIds().equal_range(T);
- for (const auto &KV : make_range(TidIter)) {
- writeTypeIdSummaryRecord(NameVals, StrtabBuilder, KV.second.first,
- KV.second.second);
+ for (const auto &[GUID, TypeIdPair] : make_range(TidIter)) {
+ writeTypeIdSummaryRecord(NameVals, StrtabBuilder, TypeIdPair.first,
+ TypeIdPair.second);
Stream.EmitRecord(bitc::FS_TYPE_ID, NameVals);
NameVals.clear();
}
diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp
index 1b569715345cca..70e3af941bf77b 100644
--- a/llvm/lib/IR/AsmWriter.cpp
+++ b/llvm/lib/IR/AsmWriter.cpp
@@ -3488,9 +3488,9 @@ void AssemblyWriter::printTypeIdInfo(
continue;
}
// Print all type id that correspond to this GUID.
- for (const auto &KV : make_range(TidIter)) {
+ for (const auto &[GUID, TypeIdPair] : make_range(TidIter)) {
Out << FS;
- auto Slot = Machine.getTypeIdSlot(KV.second.first);
+ auto Slot = Machine.getTypeIdSlot(TypeIdPair.first);
assert(Slot != -1);
Out << "^" << Slot;
}
@@ -3529,10 +3529,10 @@ void AssemblyWriter::printVFuncId(const FunctionSummary::VFuncId VFId) {
}
// Print all type id that correspond to this GUID.
FieldSeparator FS;
- for (const auto &KV : make_range(TidIter)) {
+ for (const auto &[GUID, TypeIdPair] : make_range(TidIter)) {
Out << FS;
Out << "vFuncId: (";
- auto Slot = Machine.getTypeIdSlot(KV.second.first);
+ auto Slot = Machine.getTypeIdSlot(TypeIdPair.first);
assert(Slot != -1);
Out << "^" << Slot;
Out << ", offset: " << VFId.Offset;
diff --git a/llvm/tools/llvm-profgen/ProfiledBinary.cpp b/llvm/tools/llvm-profgen/ProfiledBinary.cpp
index 07966bc92e3933..a458ffcb96b41a 100644
--- a/llvm/tools/llvm-profgen/ProfiledBinary.cpp
+++ b/llvm/tools/llvm-profgen/ProfiledBinary.cpp
@@ -423,8 +423,8 @@ void ProfiledBinary::decodePseudoProbe(const ELFObjectFileBase *Obj) {
GuidFilter.insert(Function::getGUID(F->FuncName));
for (auto &Range : F->Ranges) {
auto GUIDs = StartAddrToSymMap.equal_range(Range.first);
- for (const auto &[K, V] : make_range(GUIDs))
- FuncStartAddresses[V] = K;
+ for (const auto &[StartAddr, Func] : make_range(GUIDs))
+ FuncStartAddresses[Func] = StartAddr;
}
}
}
More information about the llvm-commits
mailing list