[llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervals.h LiveIntervals.cpp

[Alkis Evlogimenos]

Changes in directory llvm/lib/CodeGen:

LiveIntervals.h updated: 1.23 -> 1.24
LiveIntervals.cpp updated: 1.73 -> 1.74

---
Log message:

Remove defs vector from live intervals.


---
Diffs of the changes:  (+0 -20)

Index: llvm/lib/CodeGen/LiveIntervals.h
diff -u llvm/lib/CodeGen/LiveIntervals.h:1.23 llvm/lib/CodeGen/LiveIntervals.h:1.24
--- llvm/lib/CodeGen/LiveIntervals.h:1.23	Fri Apr  9 13:07:57 2004
+++ llvm/lib/CodeGen/LiveIntervals.h	Sat May 29 11:18:57 2004
@@ -36,12 +36,10 @@
         struct Interval {
             typedef std::pair<unsigned, unsigned> Range;
             typedef std::vector<Range> Ranges;
-            typedef std::vector<unsigned> Defs;
             unsigned reg;   // the register of this interval
             float weight;   // weight of this interval (number of uses
                             // * 10^loopDepth)
             Ranges ranges;  // the ranges in which this register is live
-            Defs defs;
             Interval(unsigned r);
 
             bool empty() const { return ranges.empty(); }


Index: llvm/lib/CodeGen/LiveIntervals.cpp
diff -u llvm/lib/CodeGen/LiveIntervals.cpp:1.73 llvm/lib/CodeGen/LiveIntervals.cpp:1.74
--- llvm/lib/CodeGen/LiveIntervals.cpp:1.73	Fri May  7 22:49:35 2004
+++ llvm/lib/CodeGen/LiveIntervals.cpp	Sat May 29 11:18:57 2004
@@ -137,11 +137,6 @@
                 rep(srcReg) == rep(dstReg)) {
                 // remove from def list
                 Interval& interval = getOrCreateInterval(rep(dstReg));
-                unsigned defIndex = getInstructionIndex(mii);
-                Interval::Defs::iterator d = std::lower_bound(
-                    interval.defs.begin(), interval.defs.end(), defIndex);
-                assert(*d == defIndex && "Def index not found in def list!");
-                interval.defs.erase(d);
                 // remove index -> MachineInstr and
                 // MachineInstr -> index mappings
                 Mi2IndexMap::iterator mi2i = mi2iMap_.find(mii);
@@ -289,7 +284,6 @@
     }
 
     unsigned baseIndex = getInstructionIndex(mi);
-    interval.defs.push_back(baseIndex);
 
     bool killedInDefiningBasicBlock = false;
     for (int i = 0, e = vi.Kills.size(); i != e; ++i) {
@@ -329,7 +323,6 @@
 
     MachineBasicBlock::iterator e = mbb->end();
     unsigned baseIndex = getInstructionIndex(mi);
-    interval.defs.push_back(baseIndex);
     unsigned start = getDefIndex(baseIndex);
     unsigned end = start;
 
@@ -663,11 +656,6 @@
         cur = mergeRangesBackward(cur);
     }
     weight += other.weight;
-    Defs u;
-    std::set_union(defs.begin(), defs.end(),
-                   other.defs.begin(), other.defs.end(),
-                   std::back_inserter(u));
-    defs = u;
     ++numJoins;
 }
 
@@ -707,12 +695,6 @@
     if (li.empty())
         return os << "EMPTY";
 
-    os << " {" << li.defs.front();
-    for (LiveIntervals::Interval::Defs::const_iterator
-             i = next(li.defs.begin()), e = li.defs.end(); i != e; ++i)
-        os << "," << *i;
-    os << "}";
-
     os << " = ";
     for (LiveIntervals::Interval::Ranges::const_iterator
              i = li.ranges.begin(), e = li.ranges.end(); i != e; ++i) {