Clean up and bug fix.

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

diff --git a/include/llvm/CodeGen/LiveInterval.h b/include/llvm/CodeGen/LiveInterval.h
index 508a8b0c256087f7de5f8ca05fe43e3c7ad2a2ea..71daf611f60890401190ee260cf9a4a4f551942f 100644 (file)
--- a/include/llvm/CodeGen/LiveInterval.h
+++ b/include/llvm/CodeGen/LiveInterval.h
@@ -147,19 +147,19 @@ namespace llvm {
     /// getInstForValNum - Return the machine instruction index that defines the
     /// specified value number.
     unsigned getInstForValNum(unsigned ValNo) const {
-      //assert(ValNo < ValueNumberInfo.size());
+      assert(ValNo < ValueNumberInfo.size());
       return ValueNumberInfo[ValNo].def;
     }
     
     unsigned getSrcRegForValNum(unsigned ValNo) const {
-      //assert(ValNo < ValueNumberInfo.size());
+      assert(ValNo < ValueNumberInfo.size());
       return ValueNumberInfo[ValNo].reg;
     }
     
     /// getKillsForValNum - Return the kill instruction indexes of the specified
     /// value number.
-    SmallVector<unsigned, 4> getKillsForValNum(unsigned ValNo) const {
-      //assert(ValNo < ValueNumberInfo.size());
+    const SmallVector<unsigned, 4> &getKillsForValNum(unsigned ValNo) const {
+      assert(ValNo < ValueNumberInfo.size());
       return ValueNumberInfo[ValNo].kills;
     }
     
@@ -170,7 +170,7 @@ namespace llvm {
     }
     
     VNInfo getValNumInfo(unsigned ValNo) const {
-      //assert(ValNo < ValueNumberInfo.size());
+      assert(ValNo < ValueNumberInfo.size());
       return ValueNumberInfo[ValNo];
     }
     

diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp
index 580cf4438372d6b520fe5902e2e225cfd1d1b9d2..32399ef2fc7ec097f4891be54b5be08e1ea92172 100644 (file)
--- a/lib/CodeGen/LiveInterval.cpp
+++ b/lib/CodeGen/LiveInterval.cpp
@@ -300,7 +300,7 @@ void LiveInterval::join(LiveInterval &Other, int *LHSValNoAssignments,
   // we want to avoid the interval scan if not.
   bool MustMapCurValNos = false;
   for (unsigned i = 0, e = getNumValNums(); i != e; ++i) {
-    //if (ValueNumberInfo[i].def == ~1U) continue;  // tombstone value #
+    if (ValueNumberInfo[i].def == ~1U) continue;  // tombstone value #
     if (i != (unsigned)LHSValNoAssignments[i]) {
       MustMapCurValNos = true;
       break;