Convert operand iterator over to work like an STL iterator
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1720 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/LiveVar/BBLiveVar.cpp b/lib/Analysis/LiveVar/BBLiveVar.cpp
index 35548f6..e4a8a51 100644
--- a/lib/Analysis/LiveVar/BBLiveVar.cpp
+++ b/lib/Analysis/LiveVar/BBLiveVar.cpp
@@ -45,7 +45,8 @@
}
// iterate over MI operands to find defs
- for (MachineInstr::val_const_op_iterator OpI(MI); !OpI.done(); ++OpI)
+ for (MachineInstr::const_val_op_iterator OpI = MI->begin(), OpE = MI->end();
+ OpI != OpE; ++OpI)
if (OpI.isDef()) // add to Defs only if this operand is a def
addDef(*OpI);
@@ -57,10 +58,11 @@
bool IsPhi = MI->getOpCode() == PHI;
// iterate over MI operands to find uses
- for (MachineInstr::val_const_op_iterator OpI(MI); !OpI.done(); ++OpI) {
+ for (MachineInstr::const_val_op_iterator OpI = MI->begin(), OpE = MI->end();
+ OpI != OpE; ++OpI) {
const Value *Op = *OpI;
- if (Op->getType()->isLabelType())
+ if (isa<BasicBlock>(Op))
continue; // don't process labels
if (!OpI.isDef()) { // add to Defs only if this operand is a use