diff --git a/lib/CodeGen/SelectionDAG/InstrEmitter.cpp b/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
index 5f0c0e8d4fa..1d44ff66291 100644
--- a/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
+++ b/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
@@ -296,7 +296,6 @@ InstrEmitter::AddRegisterOperand(MachineInstr *MI, SDValue Op,
     }
   }
 
-#if 0
   // If this value has only one use, that use is a kill. This is a
   // conservative approximation. Tied operands are never killed, so we need
   // to check that. And that means we need to determine the index of the
@@ -306,10 +305,7 @@ InstrEmitter::AddRegisterOperand(MachineInstr *MI, SDValue Op,
          MI->getOperand(Idx-1).isReg() && MI->getOperand(Idx-1).isImplicit())
     --Idx;
   bool isTied = MI->getDesc().getOperandConstraint(Idx, TOI::TIED_TO) != -1;
-  bool isKill = Op.hasOneUse() && !isTied;
-#else
-  bool isKill = false;
-#endif
+  bool isKill = Op.hasOneUse() && !isTied && !IsDebug;
 
   MI->addOperand(MachineOperand::CreateReg(VReg, isOptDef,
                                            false/*isImp*/, isKill,