Skip to content

Commit c29330c

Browse files
kazutakahirataIanWood1
authored andcommitted
[llvm] Use range-based for loops with llvm::drop_begin (NFC) (llvm#136417)
1 parent 798de2b commit c29330c

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

llvm/lib/Bitcode/Reader/BitcodeReader.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8079,9 +8079,9 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
80798079
case bitc::FS_PERMODULE_CALLSITE_INFO: {
80808080
unsigned ValueID = Record[0];
80818081
SmallVector<unsigned> StackIdList;
8082-
for (auto R = Record.begin() + 1; R != Record.end(); R++) {
8083-
assert(*R < StackIds.size());
8084-
StackIdList.push_back(TheIndex.addOrGetStackIdIndex(StackIds[*R]));
8082+
for (uint64_t R : drop_begin(Record)) {
8083+
assert(R < StackIds.size());
8084+
StackIdList.push_back(TheIndex.addOrGetStackIdIndex(StackIds[R]));
80858085
}
80868086
ValueInfo VI = std::get<0>(getValueInfoFromValueId(ValueID));
80878087
PendingCallsites.push_back(CallsiteInfo({VI, std::move(StackIdList)}));

llvm/lib/IR/DebugInfo.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -976,9 +976,9 @@ void Instruction::mergeDIAssignID(
976976
return; // No DIAssignID tags to process.
977977

978978
DIAssignID *MergeID = IDs[0];
979-
for (auto It = std::next(IDs.begin()), End = IDs.end(); It != End; ++It) {
980-
if (*It != MergeID)
981-
at::RAUW(*It, MergeID);
979+
for (DIAssignID *AssignID : drop_begin(IDs)) {
980+
if (AssignID != MergeID)
981+
at::RAUW(AssignID, MergeID);
982982
}
983983
setMetadata(LLVMContext::MD_DIAssignID, MergeID);
984984
}

llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,7 @@ static bool foldGEPChainAsStructAccess(SmallVector<GetElementPtrInst *> &GEPs,
345345
Info.Indices.append(First->idx_begin(), First->idx_end());
346346
Info.Members.push_back(First);
347347

348-
for (auto *Iter = GEPs.begin() + 1; Iter != GEPs.end(); ++Iter) {
349-
GetElementPtrInst *GEP = *Iter;
348+
for (GetElementPtrInst *GEP : drop_begin(GEPs)) {
350349
if (!isZero(*GEP->idx_begin())) {
351350
Info.reset();
352351
return false;

llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,8 @@ class SPIRVStructurizer : public FunctionPass {
509509
}
510510

511511
SwitchInst *Sw = ExitBuilder.CreateSwitch(Load, Dsts[0], Dsts.size() - 1);
512-
for (auto It = Dsts.begin() + 1; It != Dsts.end(); ++It) {
513-
Sw->addCase(DstToIndex[*It], *It);
514-
}
512+
for (BasicBlock *BB : drop_begin(Dsts))
513+
Sw->addCase(DstToIndex[BB], BB);
515514
return NewExit;
516515
}
517516
};

llvm/lib/Transforms/Vectorize/SandboxVectorizer/SeedCollector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ArrayRef<Instruction *> SeedBundle::getSlice(unsigned StartIdx,
4646
uint32_t BitCountPowerOfTwo = 0;
4747
// Can't start a slice with a used instruction.
4848
assert(!isUsed(StartIdx) && "Expected unused at StartIdx");
49-
for (auto S : make_range(Seeds.begin() + StartIdx, Seeds.end())) {
49+
for (Instruction *S : drop_begin(Seeds, StartIdx)) {
5050
// Stop if this instruction is used. This needs to be done before
5151
// getNumBits() because a "used" instruction may have been erased.
5252
if (isUsed(StartIdx + NumElements))

0 commit comments

Comments
 (0)