[llvm] Use range-based for loops with llvm::drop_begin (NFC) #136417
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
@llvm/pr-subscribers-llvm-ir @llvm/pr-subscribers-vectorizers Author: Kazu Hirata (kazutakahirata) ChangesFull diff: https://github.com/llvm/llvm-project/pull/136417.diff 5 Files Affected:
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 5c62ef4ad8e4e..b152adfbd93d8 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -8079,9 +8079,9 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
case bitc::FS_PERMODULE_CALLSITE_INFO: {
unsigned ValueID = Record[0];
SmallVector<unsigned> StackIdList;
- for (auto R = Record.begin() + 1; R != Record.end(); R++) {
- assert(*R < StackIds.size());
- StackIdList.push_back(TheIndex.addOrGetStackIdIndex(StackIds[*R]));
+ for (uint64_t R : drop_begin(Record)) {
+ assert(R < StackIds.size());
+ StackIdList.push_back(TheIndex.addOrGetStackIdIndex(StackIds[R]));
}
ValueInfo VI = std::get<0>(getValueInfoFromValueId(ValueID));
PendingCallsites.push_back(CallsiteInfo({VI, std::move(StackIdList)}));
diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp
index cefd6fe14a3ac..7a133b209459b 100644
--- a/llvm/lib/IR/DebugInfo.cpp
+++ b/llvm/lib/IR/DebugInfo.cpp
@@ -976,9 +976,9 @@ void Instruction::mergeDIAssignID(
return; // No DIAssignID tags to process.
DIAssignID *MergeID = IDs[0];
- for (auto It = std::next(IDs.begin()), End = IDs.end(); It != End; ++It) {
- if (*It != MergeID)
- at::RAUW(*It, MergeID);
+ for (DIAssignID *AssignID : drop_begin(IDs)) {
+ if (AssignID != MergeID)
+ at::RAUW(AssignID, MergeID);
}
setMetadata(LLVMContext::MD_DIAssignID, MergeID);
}
diff --git a/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp b/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp
index 2b890ddccf628..c21a1d03630fa 100644
--- a/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp
+++ b/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp
@@ -345,8 +345,7 @@ static bool foldGEPChainAsStructAccess(SmallVector<GetElementPtrInst *> &GEPs,
Info.Indices.append(First->idx_begin(), First->idx_end());
Info.Members.push_back(First);
- for (auto *Iter = GEPs.begin() + 1; Iter != GEPs.end(); ++Iter) {
- GetElementPtrInst *GEP = *Iter;
+ for (GetElementPtrInst *GEP : drop_begin(GEPs)) {
if (!isZero(*GEP->idx_begin())) {
Info.reset();
return false;
diff --git a/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp b/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp
index 324b80fe2efc6..68448acf45c3c 100644
--- a/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp
@@ -509,9 +509,8 @@ class SPIRVStructurizer : public FunctionPass {
}
SwitchInst *Sw = ExitBuilder.CreateSwitch(Load, Dsts[0], Dsts.size() - 1);
- for (auto It = Dsts.begin() + 1; It != Dsts.end(); ++It) {
- Sw->addCase(DstToIndex[*It], *It);
- }
+ for (BasicBlock *BB : drop_begin(Dsts))
+ Sw->addCase(DstToIndex[BB], BB);
return NewExit;
}
};
diff --git a/llvm/lib/Transforms/Vectorize/SandboxVectorizer/SeedCollector.cpp b/llvm/lib/Transforms/Vectorize/SandboxVectorizer/SeedCollector.cpp
index 427c7d9895d88..ee7063437a8fc 100644
--- a/llvm/lib/Transforms/Vectorize/SandboxVectorizer/SeedCollector.cpp
+++ b/llvm/lib/Transforms/Vectorize/SandboxVectorizer/SeedCollector.cpp
@@ -46,7 +46,7 @@ ArrayRef<Instruction *> SeedBundle::getSlice(unsigned StartIdx,
uint32_t BitCountPowerOfTwo = 0;
// Can't start a slice with a used instruction.
assert(!isUsed(StartIdx) && "Expected unused at StartIdx");
- for (auto S : make_range(Seeds.begin() + StartIdx, Seeds.end())) {
+ for (Instruction *S : drop_begin(Seeds, StartIdx)) {
// Stop if this instruction is used. This needs to be done before
// getNumBits() because a "used" instruction may have been erased.
if (isUsed(StartIdx + NumElements))
|
Member
|
@llvm/pr-subscribers-backend-spir-v Author: Kazu Hirata (kazutakahirata) ChangesFull diff: https://github.com/llvm/llvm-project/pull/136417.diff 5 Files Affected:
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 5c62ef4ad8e4e..b152adfbd93d8 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -8079,9 +8079,9 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
case bitc::FS_PERMODULE_CALLSITE_INFO: {
unsigned ValueID = Record[0];
SmallVector<unsigned> StackIdList;
- for (auto R = Record.begin() + 1; R != Record.end(); R++) {
- assert(*R < StackIds.size());
- StackIdList.push_back(TheIndex.addOrGetStackIdIndex(StackIds[*R]));
+ for (uint64_t R : drop_begin(Record)) {
+ assert(R < StackIds.size());
+ StackIdList.push_back(TheIndex.addOrGetStackIdIndex(StackIds[R]));
}
ValueInfo VI = std::get<0>(getValueInfoFromValueId(ValueID));
PendingCallsites.push_back(CallsiteInfo({VI, std::move(StackIdList)}));
diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp
index cefd6fe14a3ac..7a133b209459b 100644
--- a/llvm/lib/IR/DebugInfo.cpp
+++ b/llvm/lib/IR/DebugInfo.cpp
@@ -976,9 +976,9 @@ void Instruction::mergeDIAssignID(
return; // No DIAssignID tags to process.
DIAssignID *MergeID = IDs[0];
- for (auto It = std::next(IDs.begin()), End = IDs.end(); It != End; ++It) {
- if (*It != MergeID)
- at::RAUW(*It, MergeID);
+ for (DIAssignID *AssignID : drop_begin(IDs)) {
+ if (AssignID != MergeID)
+ at::RAUW(AssignID, MergeID);
}
setMetadata(LLVMContext::MD_DIAssignID, MergeID);
}
diff --git a/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp b/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp
index 2b890ddccf628..c21a1d03630fa 100644
--- a/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp
+++ b/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp
@@ -345,8 +345,7 @@ static bool foldGEPChainAsStructAccess(SmallVector<GetElementPtrInst *> &GEPs,
Info.Indices.append(First->idx_begin(), First->idx_end());
Info.Members.push_back(First);
- for (auto *Iter = GEPs.begin() + 1; Iter != GEPs.end(); ++Iter) {
- GetElementPtrInst *GEP = *Iter;
+ for (GetElementPtrInst *GEP : drop_begin(GEPs)) {
if (!isZero(*GEP->idx_begin())) {
Info.reset();
return false;
diff --git a/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp b/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp
index 324b80fe2efc6..68448acf45c3c 100644
--- a/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp
@@ -509,9 +509,8 @@ class SPIRVStructurizer : public FunctionPass {
}
SwitchInst *Sw = ExitBuilder.CreateSwitch(Load, Dsts[0], Dsts.size() - 1);
- for (auto It = Dsts.begin() + 1; It != Dsts.end(); ++It) {
- Sw->addCase(DstToIndex[*It], *It);
- }
+ for (BasicBlock *BB : drop_begin(Dsts))
+ Sw->addCase(DstToIndex[BB], BB);
return NewExit;
}
};
diff --git a/llvm/lib/Transforms/Vectorize/SandboxVectorizer/SeedCollector.cpp b/llvm/lib/Transforms/Vectorize/SandboxVectorizer/SeedCollector.cpp
index 427c7d9895d88..ee7063437a8fc 100644
--- a/llvm/lib/Transforms/Vectorize/SandboxVectorizer/SeedCollector.cpp
+++ b/llvm/lib/Transforms/Vectorize/SandboxVectorizer/SeedCollector.cpp
@@ -46,7 +46,7 @@ ArrayRef<Instruction *> SeedBundle::getSlice(unsigned StartIdx,
uint32_t BitCountPowerOfTwo = 0;
// Can't start a slice with a used instruction.
assert(!isUsed(StartIdx) && "Expected unused at StartIdx");
- for (auto S : make_range(Seeds.begin() + StartIdx, Seeds.end())) {
+ for (Instruction *S : drop_begin(Seeds, StartIdx)) {
// Stop if this instruction is used. This needs to be done before
// getNumBits() because a "used" instruction may have been erased.
if (isUsed(StartIdx + NumElements))
|
kuhar
approved these changes
Apr 19, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.