2 files changed, 42 insertions, 28 deletions
diff --git a/llvm/include/llvm/CodeGen/LiveVariables.h b/llvm/include/llvm/CodeGen/LiveVariables.h
index a0f8c01e28f..a61eca89c15 100644
--- a/llvm/include/llvm/CodeGen/LiveVariables.h
+++ b/llvm/include/llvm/CodeGen/LiveVariables.h
@@ -242,19 +242,8 @@ public:
 
   /// removeVirtualRegistersKilled - Remove all killed info for the specified
   /// instruction.
-  void removeVirtualRegistersKilled(MachineInstr *MI) {
-    std::map<MachineInstr*, std::vector<unsigned> >::iterator I = 
-      RegistersKilled.find(MI);
-    if (I != RegistersKilled.end()) {
-      std::vector<unsigned> &Regs = I->second;
-      for (unsigned i = 0, e = Regs.size(); i != e; ++i) {
-        bool removed = getVarInfo(Regs[i]).removeKill(MI);
-        assert(removed && "kill not in register's VarInfo?");
-      }
-      RegistersKilled.erase(I);
-    }
-  }
-
+  void removeVirtualRegistersKilled(MachineInstr *MI);
+  
   /// addVirtualRegisterDead - Add information about the fact that the specified
   /// register is dead after being used by the specified instruction.
   ///
@@ -292,21 +281,10 @@ public:
     return true;
   }
 
-  /// removeVirtualRegistersDead - Remove all of the specified dead
-  /// registers from the live variable information.
-  void removeVirtualRegistersDead(MachineInstr *MI) {
-    std::map<MachineInstr*, std::vector<unsigned> >::iterator I = 
-      RegistersDead.find(MI);
-    if (I != RegistersDead.end()) {
-      std::vector<unsigned> &Regs = I->second;
-      for (unsigned i = 0, e = Regs.size(); i != e; ++i) {
-        bool removed = getVarInfo(Regs[i]).removeKill(MI);
-        assert(removed && "kill not in register's VarInfo?");
-      }
-      RegistersDead.erase(I);
-    }
-  }
-
+  /// removeVirtualRegistersDead - Remove all of the dead registers for the
+  /// specified instruction from the live variable information.
+  void removeVirtualRegistersDead(MachineInstr *MI);
+  
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
   }
diff --git a/llvm/lib/CodeGen/LiveVariables.cpp b/llvm/lib/CodeGen/LiveVariables.cpp
index 4f203e983b7..4e5c96ec211 100644
--- a/llvm/lib/CodeGen/LiveVariables.cpp
+++ b/llvm/lib/CodeGen/LiveVariables.cpp
@@ -415,3 +415,39 @@ void LiveVariables::instructionChanged(MachineInstr *OldMI,
     RegistersDead.erase(OldMI);
   }
 }
+
+/// removeVirtualRegistersKilled - Remove all killed info for the specified
+/// instruction.
+void LiveVariables::removeVirtualRegistersKilled(MachineInstr *MI) {
+  std::map<MachineInstr*, std::vector<unsigned> >::iterator I = 
+    RegistersKilled.find(MI);
+  if (I == RegistersKilled.end()) return;
+
+  std::vector<unsigned> &Regs = I->second;
+  for (unsigned i = 0, e = Regs.size(); i != e; ++i) {
+    if (MRegisterInfo::isVirtualRegister(Regs[i])) {
+      bool removed = getVarInfo(Regs[i]).removeKill(MI);
+      assert(removed && "kill not in register's VarInfo?");
+    }
+  }
+  RegistersKilled.erase(I);
+}
+
+/// removeVirtualRegistersDead - Remove all of the dead registers for the
+/// specified instruction from the live variable information.
+void LiveVariables::removeVirtualRegistersDead(MachineInstr *MI) {
+  std::map<MachineInstr*, std::vector<unsigned> >::iterator I = 
+    RegistersDead.find(MI);
+  if (I == RegistersDead.end()) return;
+  
+  std::vector<unsigned> &Regs = I->second;
+  for (unsigned i = 0, e = Regs.size(); i != e; ++i) {
+    if (MRegisterInfo::isVirtualRegister(Regs[i])) {
+      bool removed = getVarInfo(Regs[i]).removeKill(MI);
+      assert(removed && "kill not in register's VarInfo?");
+    }
+  }
+  RegistersDead.erase(I);
+}
+
+