Fix the new load-unfolding code to update LiveVariable's dead flags,

in addition to the kill flags.

llvm-svn: 106512

1 files changed, 8 insertions, 2 deletions

diff --git a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
index 6144ecd002e..017d8b772f9 100644
--- a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
+++ b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
@@ -961,8 +961,14 @@ TryInstructionTransform(MachineBasicBlock::iterator &mi,
           if (LV) {
             for (unsigned i = 0, e = mi->getNumOperands(); i != e; ++i) {
               MachineOperand &MO = mi->getOperand(i);
-              if (MO.isReg() && MO.isUse() && MO.isKill())
-                LV->replaceKillInstruction(Reg, mi, NewMIs[0]);
+              if (MO.isReg() && MO.getReg() != 0 &&
+                  TargetRegisterInfo::isVirtualRegister(MO.getReg())) {
+                if (MO.isUse()) {
+                  if (MO.isKill())
+                    LV->replaceKillInstruction(MO.getReg(), mi, NewMIs[0]);
+                } else if (LV->removeVirtualRegisterDead(MO.getReg(), mi))
+                  LV->addVirtualRegisterDead(MO.getReg(), NewMIs[1]);
+              }
             }
             LV->addVirtualRegisterKilled(Reg, NewMIs[1]);
           }