Replace the odd kill# hack with something less fragile.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44434 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp
index 934cb7b..4721650 100644
--- a/lib/CodeGen/LiveInterval.cpp
+++ b/lib/CodeGen/LiveInterval.cpp
@@ -206,7 +206,7 @@
         // endpoint as well.
         if (End > it->end)
           extendIntervalEndTo(it, End);
-        else
+        else if (End < it->end)
           // Overlapping intervals, there might have been a kill here.
           removeKill(it->valno, End);
         return it;
@@ -631,6 +631,8 @@
             if (j != ee-1)
               OS << " ";
           }
+          if (vni->hasPHIKill)
+            OS << " phi";
           OS << ")";
         }
       }