A couple of kill marker maintainence bug.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48653 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/CodeGen/SimpleRegisterCoalescing.cpp b/lib/CodeGen/SimpleRegisterCoalescing.cpp
index cc413c3..6326eda 100644
--- a/lib/CodeGen/SimpleRegisterCoalescing.cpp
+++ b/lib/CodeGen/SimpleRegisterCoalescing.cpp
@@ -432,6 +432,7 @@ SimpleRegisterCoalescing::UpdateRegDefsUses(unsigned SrcReg, unsigned DstReg,
   for (MachineRegisterInfo::reg_iterator I = mri_->reg_begin(SrcReg),
          E = mri_->reg_end(); I != E; ) {
     MachineOperand &O = I.getOperand();
+    MachineInstr *UseMI = &*I;
     ++I;
     if (DstIsPhys) {
       unsigned UseSubIdx = O.getSubReg();
@@ -451,6 +452,9 @@ SimpleRegisterCoalescing::UpdateRegDefsUses(unsigned SrcReg, unsigned DstReg,
         assert(OldSubIdx < SubIdx && "Conflicting sub-register index!");
       else if (SubIdx)
         O.setSubReg(SubIdx);
+      // Remove would-be duplicated kill marker.
+      if (O.isKill() && UseMI->killsRegister(DstReg))
+        O.setIsKill(false);
       O.setReg(DstReg);
     }
   }
diff --git a/lib/CodeGen/VirtRegMap.cpp b/lib/CodeGen/VirtRegMap.cpp
index b094412..f89ef9a 100644
--- a/lib/CodeGen/VirtRegMap.cpp
+++ b/lib/CodeGen/VirtRegMap.cpp
@@ -610,7 +610,7 @@ static void UpdateKills(MachineInstr &MI, BitVector &RegKills,
     if (Reg == 0)
       continue;
     
-    if (RegKills[Reg]) {
+    if (RegKills[Reg] && KillOps[Reg]->getParent() != &MI) {
       // That can't be right. Register is killed but not re-defined and it's
       // being reused. Let's fix that.
       KillOps[Reg]->setIsKill(false);