X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAnalysis%2FIntervalPartition.cpp;h=2e259b147b8b0efa46b29050fdd8ee0a6d345d5c;hb=1e80bef8962d84375bdcb3d9d1d43a4631870499;hp=e71f400f4aa446b061f68ef3e96e0e428639357d;hpb=2b37d7cf28b1382420b5e4007042feeb66d21ac8;p=oota-llvm.git

diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp
index e71f400f4aa..2e259b147b8 100644
--- a/lib/Analysis/IntervalPartition.cpp
+++ b/lib/Analysis/IntervalPartition.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -15,24 +15,26 @@
 #include "llvm/Analysis/IntervalIterator.h"
 using namespace llvm;
 
-static RegisterAnalysis<IntervalPartition>
-X("intervals", "Interval Partition Construction", true);
+char IntervalPartition::ID = 0;
+INITIALIZE_PASS(IntervalPartition, "intervals",
+                "Interval Partition Construction", true, true)
 
 //===----------------------------------------------------------------------===//
 // IntervalPartition Implementation
 //===----------------------------------------------------------------------===//
 
-// destroy - Reset state back to before function was analyzed
-void IntervalPartition::destroy() {
+// releaseMemory - Reset state back to before function was analyzed
+void IntervalPartition::releaseMemory() {
   for (unsigned i = 0, e = Intervals.size(); i != e; ++i)
     delete Intervals[i];
   IntervalMap.clear();
+  Intervals.clear();
   RootInterval = 0;
 }
 
-void IntervalPartition::print(std::ostream &O, const Module*) const {
-  std::copy(Intervals.begin(), Intervals.end(),
-            std::ostream_iterator<const Interval *>(O, "\n"));
+void IntervalPartition::print(raw_ostream &O, const Module*) const {
+  for(unsigned i = 0, e = Intervals.size(); i != e; ++i)
+    Intervals[i]->print(O);
 }
 
 // addIntervalToPartition - Add an interval to the internal list of intervals,
@@ -56,7 +58,7 @@ void IntervalPartition::addIntervalToPartition(Interval *I) {
 void IntervalPartition::updatePredecessors(Interval *Int) {
   BasicBlock *Header = Int->getHeaderNode();
   for (Interval::succ_iterator I = Int->Successors.begin(),
-	                       E = Int->Successors.end(); I != E; ++I)
+         E = Int->Successors.end(); I != E; ++I)
     getBlockInterval(*I)->Predecessors.push_back(Header);
 }
 
@@ -88,9 +90,9 @@ bool IntervalPartition::runOnFunction(Function &F) {
 // existing interval graph.  This takes an additional boolean parameter to
 // distinguish it from a copy constructor.  Always pass in false for now.
 //
-IntervalPartition::IntervalPartition(IntervalPartition &IP, bool) {
-  Interval *FunctionStart = IP.getRootInterval();
-  assert(FunctionStart && "Cannot operate on empty IntervalPartitions!");
+IntervalPartition::IntervalPartition(IntervalPartition &IP, bool)
+  : FunctionPass(ID) {
+  assert(IP.getRootInterval() && "Cannot operate on empty IntervalPartitions!");
 
   // Pass false to intervals_begin because we take ownership of it's memory
   interval_part_interval_iterator I = intervals_begin(IP, false);