Bug 1027897 - IonMonkey: Minor code simplifications. r=bhackett

js/src/jit/BacktrackingAllocator.cpp

@@ -963,7 +963,7 @@ BacktrackingAllocator::resolveControlFlow()
                 LBlock *predecessor = mSuccessor->getPredecessor(k)->lir();
                 JS_ASSERT(predecessor->mir()->numSuccessors() == 1);
 
-                LAllocation *input = phi->getOperand(predecessor->mir()->positionInPhiSuccessor());
+                LAllocation *input = phi->getOperand(k);
                 LiveInterval *from = vregs[input].intervalFor(outputOf(predecessor->lastId()));
                 JS_ASSERT(from);
 

js/src/jit/LinearScan.cpp

@@ -242,7 +242,7 @@ LinearScanAllocator::resolveControlFlow()
                 LBlock *predecessor = mSuccessor->getPredecessor(k)->lir();
                 JS_ASSERT(predecessor->mir()->numSuccessors() == 1);
 
-                LAllocation *input = phi->getOperand(predecessor->mir()->positionInPhiSuccessor());
+                LAllocation *input = phi->getOperand(k);
                 LiveInterval *from = vregs[input].intervalFor(outputOf(predecessor->lastId()));
                 JS_ASSERT(from);
 

js/src/jit/RegisterAllocator.cpp

@@ -234,7 +234,7 @@ AllocationIntegrityState::checkIntegrity(LBlock *block, LInstruction *ins,
         if (info.outputs[0].virtualRegister() == vreg) {
             for (size_t j = 0, jend = phi->numOperands(); j < jend; j++) {
                 uint32_t newvreg = info.inputs[j].toUse()->virtualRegister();
-                LBlock *predecessor = graph.getBlock(block->mir()->getPredecessor(j)->id());
+                LBlock *predecessor = block->mir()->getPredecessor(j)->lir();
                 if (!addPredecessor(predecessor, newvreg, alloc))
                     return false;
             }
@@ -245,7 +245,7 @@ AllocationIntegrityState::checkIntegrity(LBlock *block, LInstruction *ins,
     // No phi which defined the vreg we are tracking, follow back through all
     // predecessors with the existing vreg.
     for (size_t i = 0, iend = block->mir()->numPredecessors(); i < iend; i++) {
-        LBlock *predecessor = graph.getBlock(block->mir()->getPredecessor(i)->id());
+        LBlock *predecessor = block->mir()->getPredecessor(i)->lir();
         if (!addPredecessor(predecessor, vreg, alloc))
             return false;
     }

js/src/jit/StupidAllocator.cpp

@@ -282,7 +282,7 @@ StupidAllocator::syncForBlockEnd(LBlock *block, LInstruction *ins)
     MBasicBlock *successor = block->mir()->successorWithPhis();
     if (successor) {
         uint32_t position = block->mir()->positionInPhiSuccessor();
-        LBlock *lirsuccessor = graph.getBlock(successor->id());
+        LBlock *lirsuccessor = successor->lir();
         for (size_t i = 0; i < lirsuccessor->numPhis(); i++) {
             LPhi *phi = lirsuccessor->getPhi(i);