Skip to content

Commit 1019457

Browse files
[CodeGen] Use *Set::insert_range (NFC) (#132651)
We can use *Set::insert_range to collapse: for (auto Elem : Range) Set.insert(E); down to: Set.insert_range(Range);
1 parent 054e0b4 commit 1019457

File tree

10 files changed

+21
-42
lines changed

10 files changed

+21
-42
lines changed

llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,7 @@ static void interpretValues(const MachineInstr *CurMI,
694694
for (auto &FwdReg : ForwardedRegWorklist)
695695
if (TRI.regsOverlap(FwdReg.first, MO.getReg()))
696696
Defs.insert(FwdReg.first);
697-
for (MCRegUnit Unit : TRI.regunits(MO.getReg()))
698-
NewClobberedRegUnits.insert(Unit);
697+
NewClobberedRegUnits.insert_range(TRI.regunits(MO.getReg()));
699698
}
700699
}
701700
};
@@ -2380,8 +2379,7 @@ void DwarfDebug::findForceIsStmtInstrs(const MachineFunction *MF) {
23802379
continue;
23812380
for (auto &MI : MBB) {
23822381
if (MI.getDebugLoc() && MI.getDebugLoc()->getLine()) {
2383-
for (auto *Pred : MBB.predecessors())
2384-
PredMBBsToExamine.insert(Pred);
2382+
PredMBBsToExamine.insert_range(MBB.predecessors());
23852383
PotentialIsStmtMBBInstrs.insert({&MBB, &MI});
23862384
break;
23872385
}

llvm/lib/CodeGen/CodeGenPrepare.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6809,8 +6809,7 @@ bool CodeGenPrepare::optimizePhiType(
68096809
}
68106810

68116811
// Save the removed phis to be deleted later.
6812-
for (PHINode *Phi : PhiNodes)
6813-
DeletedInstrs.insert(Phi);
6812+
DeletedInstrs.insert_range(PhiNodes);
68146813
return true;
68156814
}
68166815

llvm/lib/CodeGen/GlobalISel/LoadStoreOpt.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,7 @@ bool LoadStoreOpt::doSingleStoreMerge(SmallVectorImpl<GStore *> &Stores) {
431431
return R;
432432
});
433433

434-
for (auto *MI : Stores)
435-
InstsToErase.insert(MI);
434+
InstsToErase.insert_range(Stores);
436435
return true;
437436
}
438437

llvm/lib/CodeGen/IfConversion.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1943,16 +1943,13 @@ bool IfConverter::IfConvertDiamondCommon(
19431943
} else if (!RedefsByFalse.count(Reg)) {
19441944
// These are defined before ctrl flow reach the 'false' instructions.
19451945
// They cannot be modified by the 'true' instructions.
1946-
for (MCPhysReg SubReg : TRI->subregs_inclusive(Reg))
1947-
ExtUses.insert(SubReg);
1946+
ExtUses.insert_range(TRI->subregs_inclusive(Reg));
19481947
}
19491948
}
19501949

19511950
for (MCRegister Reg : Defs) {
1952-
if (!ExtUses.count(Reg)) {
1953-
for (MCPhysReg SubReg : TRI->subregs_inclusive(Reg))
1954-
RedefsByFalse.insert(SubReg);
1955-
}
1951+
if (!ExtUses.contains(Reg))
1952+
RedefsByFalse.insert_range(TRI->subregs_inclusive(Reg));
19561953
}
19571954
}
19581955
}

llvm/lib/CodeGen/IndirectBrExpandPass.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ bool runImpl(Function &F, const TargetLowering *TLI, DomTreeUpdater *DTU) {
119119
}
120120

121121
IndirectBrs.push_back(IBr);
122-
for (BasicBlock *SuccBB : IBr->successors())
123-
IndirectBrSuccs.insert(SuccBB);
122+
IndirectBrSuccs.insert_range(IBr->successors());
124123
}
125124

126125
if (IndirectBrs.empty())

llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,7 @@ class TransferTracker {
900900
// Commit ActiveMLoc changes.
901901
ActiveMLocIt->second.clear();
902902
if (!NewMLocs.empty())
903-
for (DebugVariableID VarID : NewMLocs)
904-
ActiveMLocs[*NewLoc].insert(VarID);
903+
ActiveMLocs[*NewLoc].insert_range(NewMLocs);
905904
}
906905

907906
/// Transfer variables based on \p Src to be based on \p Dst. This handles

llvm/lib/CodeGen/LiveVariables.cpp

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,8 @@ LiveVariables::FindLastPartialDef(Register Reg,
241241
if (MO.getReg() == 0)
242242
continue;
243243
Register DefReg = MO.getReg();
244-
if (TRI->isSubRegister(Reg, DefReg)) {
245-
for (MCPhysReg SubReg : TRI->subregs_inclusive(DefReg))
246-
PartDefRegs.insert(SubReg);
247-
}
244+
if (TRI->isSubRegister(Reg, DefReg))
245+
PartDefRegs.insert_range(TRI->subregs_inclusive(DefReg));
248246
}
249247
return LastDef;
250248
}
@@ -283,8 +281,7 @@ void LiveVariables::HandlePhysRegUse(Register Reg, MachineInstr &MI) {
283281
false/*IsDef*/,
284282
true/*IsImp*/));
285283
PhysRegDef[SubReg] = LastPartialDef;
286-
for (MCPhysReg SS : TRI->subregs(SubReg))
287-
Processed.insert(SS);
284+
Processed.insert_range(TRI->subregs(SubReg));
288285
}
289286
}
290287
} else if (LastDef && !PhysRegUse[Reg.id()] &&
@@ -370,8 +367,7 @@ bool LiveVariables::HandlePhysRegKill(Register Reg, MachineInstr *MI) {
370367
continue;
371368
}
372369
if (MachineInstr *Use = PhysRegUse[SubReg]) {
373-
for (MCPhysReg SS : TRI->subregs_inclusive(SubReg))
374-
PartUses.insert(SS);
370+
PartUses.insert_range(TRI->subregs_inclusive(SubReg));
375371
unsigned Dist = DistanceMap[Use];
376372
if (Dist > LastRefOrPartRefDist) {
377373
LastRefOrPartRefDist = Dist;
@@ -465,8 +461,7 @@ void LiveVariables::HandlePhysRegDef(Register Reg, MachineInstr *MI,
465461
// What parts of the register are previously defined?
466462
SmallSet<unsigned, 32> Live;
467463
if (PhysRegDef[Reg.id()] || PhysRegUse[Reg.id()]) {
468-
for (MCPhysReg SubReg : TRI->subregs_inclusive(Reg))
469-
Live.insert(SubReg);
464+
Live.insert_range(TRI->subregs_inclusive(Reg));
470465
} else {
471466
for (MCPhysReg SubReg : TRI->subregs(Reg)) {
472467
// If a register isn't itself defined, but all parts that make up of it
@@ -477,10 +472,8 @@ void LiveVariables::HandlePhysRegDef(Register Reg, MachineInstr *MI,
477472
// = AX
478473
if (Live.count(SubReg))
479474
continue;
480-
if (PhysRegDef[SubReg] || PhysRegUse[SubReg]) {
481-
for (MCPhysReg SS : TRI->subregs_inclusive(SubReg))
482-
Live.insert(SS);
483-
}
475+
if (PhysRegDef[SubReg] || PhysRegUse[SubReg])
476+
Live.insert_range(TRI->subregs_inclusive(SubReg));
484477
}
485478
}
486479

llvm/lib/CodeGen/MachinePipeliner.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1993,8 +1993,7 @@ static void computeLiveOuts(MachineFunction &MF, RegPressureTracker &RPTracker,
19931993
if (Reg.isVirtual())
19941994
Uses.insert(Reg);
19951995
else if (MRI.isAllocatable(Reg))
1996-
for (MCRegUnit Unit : TRI->regunits(Reg.asMCReg()))
1997-
Uses.insert(Unit);
1996+
Uses.insert_range(TRI->regunits(Reg.asMCReg()));
19981997
}
19991998
}
20001999
for (SUnit *SU : NS)

llvm/lib/CodeGen/MachineVerifier.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -907,17 +907,14 @@ MachineVerifier::visitMachineBasicBlockBefore(const MachineBasicBlock *MBB) {
907907
report("MBB live-in list contains non-physical register", MBB);
908908
continue;
909909
}
910-
for (const MCPhysReg &SubReg : TRI->subregs_inclusive(LI.PhysReg))
911-
regsLive.insert(SubReg);
910+
regsLive.insert_range(TRI->subregs_inclusive(LI.PhysReg));
912911
}
913912
}
914913

915914
const MachineFrameInfo &MFI = MF->getFrameInfo();
916915
BitVector PR = MFI.getPristineRegs(*MF);
917-
for (unsigned I : PR.set_bits()) {
918-
for (const MCPhysReg &SubReg : TRI->subregs_inclusive(I))
919-
regsLive.insert(SubReg);
920-
}
916+
for (unsigned I : PR.set_bits())
917+
regsLive.insert_range(TRI->subregs_inclusive(I));
921918

922919
regsKilled.clear();
923920
regsDefined.clear();

llvm/lib/CodeGen/SjLjEHPrepare.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,7 @@ static void MarkBlocksLiveIn(BasicBlock *BB,
150150
if (!LiveBBs.insert(BB).second)
151151
return; // already been here.
152152

153-
for (BasicBlock *B : inverse_depth_first(BB))
154-
LiveBBs.insert(B);
153+
LiveBBs.insert_range(inverse_depth_first(BB));
155154
}
156155

157156
/// substituteLPadValues - Substitute the values returned by the landingpad

0 commit comments

Comments
 (0)