[llvm] 642a361 - [llvm] Use make_early_inc_range (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Wed Nov 10 19:56:45 PST 2021
Author: Kazu Hirata
Date: 2021-11-10T19:56:35-08:00
New Revision: 642a361b7e7091a79ad6207f4a2a0b507766b0f4
URL: https://github.com/llvm/llvm-project/commit/642a361b7e7091a79ad6207f4a2a0b507766b0f4
DIFF: https://github.com/llvm/llvm-project/commit/642a361b7e7091a79ad6207f4a2a0b507766b0f4.diff
LOG: [llvm] Use make_early_inc_range (NFC)
Added:
Modified:
llvm/lib/CodeGen/ModuloSchedule.cpp
llvm/lib/CodeGen/RegisterCoalescer.cpp
llvm/lib/Target/Hexagon/HexagonOptimizeSZextends.cpp
llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp
Removed:
################################################################################
diff --git a/llvm/lib/CodeGen/ModuloSchedule.cpp b/llvm/lib/CodeGen/ModuloSchedule.cpp
index 43cca1b26c713..d2c7e8c769d32 100644
--- a/llvm/lib/CodeGen/ModuloSchedule.cpp
+++ b/llvm/lib/CodeGen/ModuloSchedule.cpp
@@ -332,14 +332,10 @@ static void replaceRegUsesAfterLoop(unsigned FromReg, unsigned ToReg,
MachineBasicBlock *MBB,
MachineRegisterInfo &MRI,
LiveIntervals &LIS) {
- for (MachineRegisterInfo::use_iterator I = MRI.use_begin(FromReg),
- E = MRI.use_end();
- I != E;) {
- MachineOperand &O = *I;
- ++I;
+ for (MachineOperand &O :
+ llvm::make_early_inc_range(MRI.use_operands(FromReg)))
if (O.getParent()->getParent() != MBB)
O.setReg(ToReg);
- }
if (!LIS.hasInterval(ToReg))
LIS.createEmptyInterval(ToReg);
}
@@ -1137,12 +1133,9 @@ void ModuloScheduleExpander::rewriteScheduledInstr(
int StagePhi = Schedule.getStage(Phi) + PhiNum;
// Rewrite uses that have been scheduled already to use the new
// Phi register.
- for (MachineRegisterInfo::use_iterator UI = MRI.use_begin(OldReg),
- EI = MRI.use_end();
- UI != EI;) {
- MachineOperand &UseOp = *UI;
+ for (MachineOperand &UseOp :
+ llvm::make_early_inc_range(MRI.use_operands(OldReg))) {
MachineInstr *UseMI = UseOp.getParent();
- ++UI;
if (UseMI->getParent() != BB)
continue;
if (UseMI->isPHI()) {
diff --git a/llvm/lib/CodeGen/RegisterCoalescer.cpp b/llvm/lib/CodeGen/RegisterCoalescer.cpp
index f20d47a580f7c..c847068bca908 100644
--- a/llvm/lib/CodeGen/RegisterCoalescer.cpp
+++ b/llvm/lib/CodeGen/RegisterCoalescer.cpp
@@ -932,12 +932,8 @@ RegisterCoalescer::removeCopyByCommutingDef(const CoalescerPair &CP,
// = B
// Update uses of IntA of the specific Val# with IntB.
- for (MachineRegisterInfo::use_iterator UI = MRI->use_begin(IntA.reg()),
- UE = MRI->use_end();
- UI != UE;
- /* ++UI is below because of possible MI removal */) {
- MachineOperand &UseMO = *UI;
- ++UI;
+ for (MachineOperand &UseMO :
+ llvm::make_early_inc_range(MRI->use_operands(IntA.reg()))) {
if (UseMO.isUndef())
continue;
MachineInstr *UseMI = UseMO.getParent();
diff --git a/llvm/lib/Target/Hexagon/HexagonOptimizeSZextends.cpp b/llvm/lib/Target/Hexagon/HexagonOptimizeSZextends.cpp
index 1941c0f35e5b4..bfd02802b7829 100644
--- a/llvm/lib/Target/Hexagon/HexagonOptimizeSZextends.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonOptimizeSZextends.cpp
@@ -74,19 +74,16 @@ bool HexagonOptimizeSZextends::runOnFunction(Function &F) {
for (auto &Arg : F.args()) {
if (F.getAttributes().hasParamAttr(Idx, Attribute::SExt)) {
if (!isa<PointerType>(Arg.getType())) {
- for (auto UI = Arg.use_begin(); UI != Arg.use_end();) {
- if (isa<SExtInst>(*UI)) {
- Instruction* Use = cast<Instruction>(*UI);
+ for (Use &U : llvm::make_early_inc_range(Arg.uses())) {
+ if (isa<SExtInst>(U)) {
+ Instruction* Use = cast<Instruction>(U);
SExtInst* SI = new SExtInst(&Arg, Use->getType());
assert (EVT::getEVT(SI->getType()) ==
(EVT::getEVT(Use->getType())));
- ++UI;
Use->replaceAllUsesWith(SI);
Instruction* First = &F.getEntryBlock().front();
SI->insertBefore(First);
Use->eraseFromParent();
- } else {
- ++UI;
}
}
}
diff --git a/llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp b/llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp
index 243ae213d665e..6b564a0356a64 100644
--- a/llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp
+++ b/llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp
@@ -560,8 +560,8 @@ bool X86LowerAMXIntrinsics::lowerTileZero(Instruction *TileZero) {
IRBuilder<> Builder(TileZero);
FixedVectorType *V256I32Ty = FixedVectorType::get(Builder.getInt32Ty(), 256);
Value *VecZero = Constant::getNullValue(V256I32Ty);
- for (auto UI = TileZero->use_begin(), UE = TileZero->use_end(); UI != UE;) {
- Instruction *I = cast<Instruction>((UI++)->getUser());
+ for (Use &U : llvm::make_early_inc_range(TileZero->uses())) {
+ Instruction *I = cast<Instruction>(U.getUser());
Value *Vec;
if (match(I, m_BitCast(m_Value(Vec)))) {
I->replaceAllUsesWith(VecZero);
More information about the llvm-commits
mailing list