diff --git a/lib/CodeGen/VirtRegMap.cpp b/lib/CodeGen/VirtRegMap.cpp
index 7523d73c2e6..fa5a6ac8e80 100644
--- a/lib/CodeGen/VirtRegMap.cpp
+++ b/lib/CodeGen/VirtRegMap.cpp
@@ -712,6 +712,7 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM) {
               NextMII = &MI;
               --NextMII;  // backtrack to the copy.
             }
+            VRM.RemoveFromFoldedVirtMap(&MI);
             MBB.erase(&MI);
             goto ProcessNextInst;
           }