From 84282c5aaa05597911ff962a7fc5038953598206 Mon Sep 17 00:00:00 2001 From: Sanjay Patel Date: Mon, 2 Oct 2017 15:02:06 +0000 Subject: [PATCH] use range-for-loops; NFCI git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@314676 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/TargetInstrInfo.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/CodeGen/TargetInstrInfo.cpp b/lib/CodeGen/TargetInstrInfo.cpp index 7bdb67c54f9..1b414c1f34e 100644 --- a/lib/CodeGen/TargetInstrInfo.cpp +++ b/lib/CodeGen/TargetInstrInfo.cpp @@ -522,11 +522,9 @@ MachineInstr *TargetInstrInfo::foldMemoryOperand(MachineInstr &MI, ArrayRef Ops, int FI, LiveIntervals *LIS) const { auto Flags = MachineMemOperand::MONone; - for (unsigned i = 0, e = Ops.size(); i != e; ++i) - if (MI.getOperand(Ops[i]).isDef()) - Flags |= MachineMemOperand::MOStore; - else - Flags |= MachineMemOperand::MOLoad; + for (unsigned OpIdx : Ops) + Flags |= MI.getOperand(OpIdx).isDef() ? MachineMemOperand::MOStore + : MachineMemOperand::MOLoad; MachineBasicBlock *MBB = MI.getParent(); assert(MBB && "foldMemoryOperand needs an inserted instruction"); @@ -542,10 +540,10 @@ MachineInstr *TargetInstrInfo::foldMemoryOperand(MachineInstr &MI, if (Flags & MachineMemOperand::MOStore) { MemSize = MFI.getObjectSize(FI); } else { - for (unsigned Idx : Ops) { + for (unsigned OpIdx : Ops) { int64_t OpSize = MFI.getObjectSize(FI); - if (auto SubReg = MI.getOperand(Idx).getSubReg()) { + if (auto SubReg = MI.getOperand(OpIdx).getSubReg()) { unsigned SubRegSize = TRI->getSubRegIdxSize(SubReg); if (SubRegSize > 0 && !(SubRegSize % 8)) OpSize = SubRegSize / 8; @@ -613,9 +611,10 @@ MachineInstr *TargetInstrInfo::foldMemoryOperand(MachineInstr &MI, LiveIntervals *LIS) const { assert(LoadMI.canFoldAsLoad() && "LoadMI isn't foldable!"); #ifndef NDEBUG - for (unsigned i = 0, e = Ops.size(); i != e; ++i) - assert(MI.getOperand(Ops[i]).isUse() && "Folding load into def!"); + for (unsigned OpIdx : Ops) + assert(MI.getOperand(OpIdx).isUse() && "Folding load into def!"); #endif + MachineBasicBlock &MBB = *MI.getParent(); MachineFunction &MF = *MBB.getParent(); -- 2.40.0