diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index abea11cff60..344b91cf82c 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -741,7 +741,7 @@ void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn, MachineFunction &MF) {
         for (; BI != End; ++BI) {
           // Just before the terminator instruction, insert instructions to
           // feed PHI nodes in successor blocks.
-          if (isa<TerminatorInst>(I))
+          if (isa<TerminatorInst>(BI))
             if (!HandlePHINodesInSuccessorBlocksFast(LLVMBB, F)) {
               if (DisableFastISelAbort)
                 break;
@@ -763,7 +763,7 @@ void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn, MachineFunction &MF) {
           if (isa<CallInst>(BI) || isa<LoadInst>(BI) ||
               isa<StoreInst>(BI)) {
             if (BI->getType() != Type::VoidTy) {
-              unsigned &R = FuncInfo->ValueMap[I];
+              unsigned &R = FuncInfo->ValueMap[BI];
               if (!R)
                 R = FuncInfo->CreateRegForValue(BI);
             }