diff --git a/lib/CodeGen/LiveVariables.cpp b/lib/CodeGen/LiveVariables.cpp
index 504b607..d1ebaf1 100644
--- a/lib/CodeGen/LiveVariables.cpp
+++ b/lib/CodeGen/LiveVariables.cpp
@@ -582,15 +582,13 @@
         if (VI.DefInst == OldMI)
           VI.DefInst = NewMI;
       }
-      if (MO.isUse()) {
-        if (MO.isKill()) {
-          MO.unsetIsKill();
-          addVirtualRegisterKilled(Reg, NewMI);
-        }
-        // If this is a kill of the value, update the VI kills list.
-        if (VI.removeKill(OldMI))
-          VI.Kills.push_back(NewMI);   // Yes, there was a kill of it
+      if (MO.isKill()) {
+        MO.unsetIsKill();
+        addVirtualRegisterKilled(Reg, NewMI);
       }
+      // If this is a kill of the value, update the VI kills list.
+      if (VI.removeKill(OldMI))
+        VI.Kills.push_back(NewMI);   // Yes, there was a kill of it
     }
   }
 }
diff --git a/lib/CodeGen/SimpleRegisterCoalescing.cpp b/lib/CodeGen/SimpleRegisterCoalescing.cpp
index b714bac..4619fd7 100644
--- a/lib/CodeGen/SimpleRegisterCoalescing.cpp
+++ b/lib/CodeGen/SimpleRegisterCoalescing.cpp
@@ -955,7 +955,7 @@
 void SimpleRegisterCoalescing::unsetRegisterKill(MachineInstr *MI, unsigned Reg) {
   for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
     MachineOperand &MO = MI->getOperand(i);
-    if (MO.isReg() && MO.isUse() && MO.isKill() && MO.getReg() &&
+    if (MO.isReg() && MO.isKill() && MO.getReg() &&
         mri_->regsOverlap(rep(MO.getReg()), Reg))
       MO.unsetIsKill();
   }
@@ -979,7 +979,7 @@
 
     for (unsigned i = 0, NumOps = MI->getNumOperands(); i != NumOps; ++i) {
       MachineOperand &MO = MI->getOperand(i);
-      if (MO.isReg() && MO.isUse() && MO.isKill() && MO.getReg() &&
+      if (MO.isReg() && MO.isKill() && MO.getReg() &&
           mri_->regsOverlap(rep(MO.getReg()), Reg)) {
         MO.unsetIsKill();
       }
