[llvm] 41ef318 - [ARM, X86] Use MachineBasicBlock::{predecessors,successors} (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Sun Nov 7 09:53:36 PST 2021
Author: Kazu Hirata
Date: 2021-11-07T09:53:16-08:00
New Revision: 41ef3187e0c734b54bbaf86656ee77956328ae0c
URL: https://github.com/llvm/llvm-project/commit/41ef3187e0c734b54bbaf86656ee77956328ae0c
DIFF: https://github.com/llvm/llvm-project/commit/41ef3187e0c734b54bbaf86656ee77956328ae0c.diff
LOG: [ARM, X86] Use MachineBasicBlock::{predecessors,successors} (NFC)
Added:
Modified:
llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
llvm/lib/Target/ARM/ARMISelLowering.cpp
llvm/lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp
llvm/lib/Target/X86/X86CmovConversion.cpp
llvm/lib/Target/X86/X86ISelLowering.cpp
llvm/lib/Target/X86/X86InstrInfo.cpp
llvm/lib/Target/X86/X86PadShortFunction.cpp
llvm/lib/Target/X86/X86VZeroUpper.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
index f19cf84253f00..a94e1012b236c 100644
--- a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
+++ b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
@@ -3265,9 +3265,8 @@ bool ARMBaseInstrInfo::optimizeCompareInstr(
// live-out. If it is live-out, do not optimize.
if (!isSafe) {
MachineBasicBlock *MBB = CmpInstr.getParent();
- for (MachineBasicBlock::succ_iterator SI = MBB->succ_begin(),
- SE = MBB->succ_end(); SI != SE; ++SI)
- if ((*SI)->isLiveIn(ARM::CPSR))
+ for (MachineBasicBlock *Succ : MBB->successors())
+ if (Succ->isLiveIn(ARM::CPSR))
return false;
}
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
index e7747e4cf25db..f49d39a4a8386 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
@@ -10956,10 +10956,9 @@ void ARMTargetLowering::EmitSjLjDispatchBlock(MachineInstr &MI,
static
MachineBasicBlock *OtherSucc(MachineBasicBlock *MBB, MachineBasicBlock *Succ) {
- for (MachineBasicBlock::succ_iterator I = MBB->succ_begin(),
- E = MBB->succ_end(); I != E; ++I)
- if (*I != Succ)
- return *I;
+ for (MachineBasicBlock *S : MBB->successors())
+ if (S != Succ)
+ return S;
llvm_unreachable("Expecting a BB with two successors!");
}
@@ -11457,13 +11456,9 @@ static bool checkAndUpdateCPSRKill(MachineBasicBlock::iterator SelectItr,
// If we hit the end of the block, check whether CPSR is live into a
// successor.
if (miI == BB->end()) {
- for (MachineBasicBlock::succ_iterator sItr = BB->succ_begin(),
- sEnd = BB->succ_end();
- sItr != sEnd; ++sItr) {
- MachineBasicBlock* succ = *sItr;
- if (succ->isLiveIn(ARM::CPSR))
+ for (MachineBasicBlock *Succ : BB->successors())
+ if (Succ->isLiveIn(ARM::CPSR))
return false;
- }
}
// We found a def, or hit the end of the basic block and CPSR wasn't live
diff --git a/llvm/lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp b/llvm/lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp
index 08c01ce7ba70c..04931afdec51c 100644
--- a/llvm/lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp
+++ b/llvm/lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp
@@ -360,10 +360,7 @@ findPotentialBlockers(MachineInstr *LoadInst) {
if (BlockCount < InspectionLimit) {
MachineBasicBlock *MBB = LoadInst->getParent();
int LimitLeft = InspectionLimit - BlockCount;
- for (MachineBasicBlock::pred_iterator PB = MBB->pred_begin(),
- PE = MBB->pred_end();
- PB != PE; ++PB) {
- MachineBasicBlock *PMBB = *PB;
+ for (MachineBasicBlock *PMBB : MBB->predecessors()) {
int PredCount = 0;
for (MachineInstr &PBInst : llvm::reverse(*PMBB)) {
if (PBInst.isMetaInstruction())
diff --git a/llvm/lib/Target/X86/X86CmovConversion.cpp b/llvm/lib/Target/X86/X86CmovConversion.cpp
index 0e5d230a56660..863438793acfd 100644
--- a/llvm/lib/Target/X86/X86CmovConversion.cpp
+++ b/llvm/lib/Target/X86/X86CmovConversion.cpp
@@ -582,10 +582,9 @@ static bool checkEFLAGSLive(MachineInstr *MI) {
}
// We hit the end of the block, check whether EFLAGS is live into a successor.
- for (auto I = BB->succ_begin(), E = BB->succ_end(); I != E; ++I) {
- if ((*I)->isLiveIn(X86::EFLAGS))
+ for (MachineBasicBlock *Succ : BB->successors())
+ if (Succ->isLiveIn(X86::EFLAGS))
return true;
- }
return false;
}
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
index 9a80394afd542..1bb872e98ce9a 100644
--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -33095,13 +33095,9 @@ static bool isEFLAGSLiveAfter(MachineBasicBlock::iterator Itr,
// If we hit the end of the block, check whether EFLAGS is live into a
// successor.
- for (MachineBasicBlock::succ_iterator sItr = BB->succ_begin(),
- sEnd = BB->succ_end();
- sItr != sEnd; ++sItr) {
- MachineBasicBlock* succ = *sItr;
- if (succ->isLiveIn(X86::EFLAGS))
+ for (MachineBasicBlock *Succ : BB->successors())
+ if (Succ->isLiveIn(X86::EFLAGS))
return true;
- }
return false;
}
diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp
index e6fa8f03ffd76..56e3541dcbd33 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.cpp
+++ b/llvm/lib/Target/X86/X86InstrInfo.cpp
@@ -3047,13 +3047,13 @@ static MachineBasicBlock *getFallThroughMBB(MachineBasicBlock *MBB,
// and fallthrough MBB. If we find more than one, we cannot identify the
// fallthrough MBB and should return nullptr.
MachineBasicBlock *FallthroughBB = nullptr;
- for (auto SI = MBB->succ_begin(), SE = MBB->succ_end(); SI != SE; ++SI) {
- if ((*SI)->isEHPad() || (*SI == TBB && FallthroughBB))
+ for (MachineBasicBlock *Succ : MBB->successors()) {
+ if (Succ->isEHPad() || (Succ == TBB && FallthroughBB))
continue;
// Return a nullptr if we found more than one fallthrough successor.
if (FallthroughBB && FallthroughBB != TBB)
return nullptr;
- FallthroughBB = *SI;
+ FallthroughBB = Succ;
}
return FallthroughBB;
}
diff --git a/llvm/lib/Target/X86/X86PadShortFunction.cpp b/llvm/lib/Target/X86/X86PadShortFunction.cpp
index e10dab72078d3..47ae517ae76d7 100644
--- a/llvm/lib/Target/X86/X86PadShortFunction.cpp
+++ b/llvm/lib/Target/X86/X86PadShortFunction.cpp
@@ -174,12 +174,9 @@ void PadShortFunc::findReturns(MachineBasicBlock *MBB, unsigned int Cycles) {
}
// Follow branches in BB and look for returns
- for (MachineBasicBlock::succ_iterator I = MBB->succ_begin();
- I != MBB->succ_end(); ++I) {
- if (*I == MBB)
- continue;
- findReturns(*I, Cycles);
- }
+ for (MachineBasicBlock *Succ : MBB->successors())
+ if (Succ != MBB)
+ findReturns(Succ, Cycles);
}
/// cyclesUntilReturn - return true if the MBB has a return instruction,
diff --git a/llvm/lib/Target/X86/X86VZeroUpper.cpp b/llvm/lib/Target/X86/X86VZeroUpper.cpp
index c3031b6985520..59b5dc111ce34 100644
--- a/llvm/lib/Target/X86/X86VZeroUpper.cpp
+++ b/llvm/lib/Target/X86/X86VZeroUpper.cpp
@@ -271,10 +271,8 @@ void VZeroUpperInserter::processBasicBlock(MachineBasicBlock &MBB) {
<< getBlockExitStateName(CurState) << '\n');
if (CurState == EXITS_DIRTY)
- for (MachineBasicBlock::succ_iterator SI = MBB.succ_begin(),
- SE = MBB.succ_end();
- SI != SE; ++SI)
- addDirtySuccessor(**SI);
+ for (MachineBasicBlock *Succ : MBB.successors())
+ addDirtySuccessor(*Succ);
BlockStates[MBB.getNumber()].ExitState = CurState;
}
More information about the llvm-commits
mailing list