diff --git a/include/llvm/CodeGen/LiveIntervalAnalysis.h b/include/llvm/CodeGen/LiveIntervalAnalysis.h
index 6bc02526a3b..1667ee3a757 100644
--- a/include/llvm/CodeGen/LiveIntervalAnalysis.h
+++ b/include/llvm/CodeGen/LiveIntervalAnalysis.h
@@ -217,14 +217,14 @@ namespace llvm {
     /// maps used by register allocator.
     void ReplaceMachineInstrInMaps(MachineInstr *MI, MachineInstr *NewMI) {
       Mi2IndexMap::iterator mi2i = mi2iMap_.find(MI);
-      if (mi2i != mi2iMap_.end()) {
-        i2miMap_[mi2i->second/InstrSlots::NUM] = NewMI;
-        Mi2IndexMap::const_iterator it = mi2iMap_.find(MI);
-        assert(it != mi2iMap_.end() && "Invalid instruction!");
-        unsigned Index = it->second;
-        mi2iMap_.erase(MI);
-        mi2iMap_[NewMI] = Index;
-      }
+      if (mi2i == mi2iMap_.end())
+        return;
+      i2miMap_[mi2i->second/InstrSlots::NUM] = NewMI;
+      Mi2IndexMap::iterator it = mi2iMap_.find(MI);
+      assert(it != mi2iMap_.end() && "Invalid instruction!");
+      unsigned Index = it->second;
+      mi2iMap_.erase(it);
+      mi2iMap_[NewMI] = Index;
     }
 
     BumpPtrAllocator& getVNInfoAllocator() { return VNInfoAllocator; }