diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp
index b50d53c..1938b4b 100644
--- a/lib/CodeGen/TwoAddressInstructionPass.cpp
+++ b/lib/CodeGen/TwoAddressInstructionPass.cpp
@@ -1032,7 +1032,8 @@
         if (KillMO) {
           if (!FirstKeptMO) {
             // All uses of regB are being replaced; move the kill to prevMI.
-            if (LV && LV->removeVirtualRegisterKilled(regB, mi))
+            KillMO->setIsKill(false);
+            if (LV && LV->getVarInfo(regB).removeKill(mi))
               LV->addVirtualRegisterKilled(regB, prevMI);
           } else {
             if (!KillMOKept) {