Fix borkness with not using MachineBasicBlocks in PHI nodes

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5035 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/RegAllocSimple.cpp b/lib/CodeGen/RegAllocSimple.cpp
index cbe131c81d07e1e198129e2c717f44ffc23c618f..c255bdab14bff73097a6107955637205bf6ea464 100644 (file)
--- a/lib/CodeGen/RegAllocSimple.cpp
+++ b/lib/CodeGen/RegAllocSimple.cpp
@@ -267,18 +267,7 @@ bool RegAllocSimple::runOnMachineFunction(MachineFunction &Fn) {
 
         // Get the MachineBasicBlock equivalent of the BasicBlock that is the
         // source path the phi
-        BasicBlock *opBB =
-          cast<BasicBlock>(MI->getOperand(i).getVRegValue());
-        MachineBasicBlock *opBlock = NULL;
-        for (MachineFunction::iterator opFi = Fn.begin(), opFe = Fn.end();
-             opFi != opFe; ++opFi)
-        {
-          if (opFi->getBasicBlock() == opBB) {
-            opBlock = opFi; break;
-          }
-        }
-        assert(opBlock && "MachineBasicBlock object not found for specified block!");
-
+        MachineBasicBlock *opBlock = MI->getOperand(i).getMachineBasicBlock();
         MachineBasicBlock::iterator opI = opBlock->end();
         MachineInstr *opMI = *(--opI);
         const MachineInstrInfo &MII = TM.getInstrInfo();