X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAnalysis%2FIntervalPartition.cpp;h=e73b40b63ed7ae7ba6a475899e79f1d53c1ed9ef;hb=e6be34a53ecbe8c2ff9f0793b13d847e94c0de91;hp=f0ed32881e408185760e0c472269a076f6838e06;hpb=389694834ad7d907c2fda87f4b59a591e8ed1a22;p=oota-llvm.git

diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp
index f0ed32881e4..e73b40b63ed 100644
--- a/lib/Analysis/IntervalPartition.cpp
+++ b/lib/Analysis/IntervalPartition.cpp
@@ -1,4 +1,11 @@
-//===- IntervalPartition.cpp - Interval Partition module code ----*- C++ -*--=//
+//===- IntervalPartition.cpp - Interval Partition module code -------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
 //
 // This file contains the definition of the IntervalPartition class, which
 // calculates and represent the interval partition of a function.
@@ -6,29 +13,27 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/IntervalIterator.h"
-#include "Support/STLExtras.h"
+using namespace llvm;
 
-using std::make_pair;
-
-static RegisterAnalysis<IntervalPartition>
+char IntervalPartition::ID = 0;
+static RegisterPass<IntervalPartition>
 X("intervals", "Interval Partition Construction", true);
 
-AnalysisID IntervalPartition::ID = X;
-
 //===----------------------------------------------------------------------===//
 // IntervalPartition Implementation
 //===----------------------------------------------------------------------===//
 
 // destroy - Reset state back to before function was analyzed
 void IntervalPartition::destroy() {
-  for_each(Intervals.begin(), Intervals.end(), deleter<Interval>);
+  for (unsigned i = 0, e = Intervals.size(); i != e; ++i)
+    delete Intervals[i];
   IntervalMap.clear();
   RootInterval = 0;
 }
 
-void IntervalPartition::print(std::ostream &O) const {
-  std::copy(Intervals.begin(), Intervals.end(),
-            std::ostream_iterator<const Interval *>(O, "\n"));
+void IntervalPartition::print(std::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,
@@ -41,18 +46,18 @@ void IntervalPartition::addIntervalToPartition(Interval *I) {
   // Add mappings for all of the basic blocks in I to the IntervalPartition
   for (Interval::node_iterator It = I->Nodes.begin(), End = I->Nodes.end();
        It != End; ++It)
-    IntervalMap.insert(make_pair(*It, I));
+    IntervalMap.insert(std::make_pair(*It, I));
 }
 
 // updatePredecessors - Interval generation only sets the successor fields of
 // the interval data structures.  After interval generation is complete,
-// run through all of the intervals and propogate successor info as
+// run through all of the intervals and propagate successor info as
 // predecessor info.
 //
 void IntervalPartition::updatePredecessors(Interval *Int) {
   BasicBlock *Header = Int->getHeaderNode();
-  for (Interval::succ_iterator I = Int->Successors.begin(), 
-	                       E = Int->Successors.end(); I != E; ++I)
+  for (Interval::succ_iterator I = Int->Successors.begin(),
+         E = Int->Successors.end(); I != E; ++I)
     getBlockInterval(*I)->Predecessors.push_back(Header);
 }
 
@@ -68,14 +73,14 @@ bool IntervalPartition::runOnFunction(Function &F) {
 
   ++I;  // After the first one...
 
-  // Add the rest of the intervals to the partition...
-  for_each(I, intervals_end(&F),
-	   bind_obj(this, &IntervalPartition::addIntervalToPartition));
+  // Add the rest of the intervals to the partition.
+  for (function_interval_iterator E = intervals_end(&F); I != E; ++I)
+    addIntervalToPartition(*I);
 
-  // Now that we know all of the successor information, propogate this to the
-  // predecessors for each block...
-  for_each(Intervals.begin(), Intervals.end(), 
-	   bind_obj(this, &IntervalPartition::updatePredecessors));
+  // Now that we know all of the successor information, propagate this to the
+  // predecessors for each block.
+  for (unsigned i = 0, e = Intervals.size(); i != e; ++i)
+    updatePredecessors(Intervals[i]);
   return false;
 }
 
@@ -84,7 +89,8 @@ 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) {
+IntervalPartition::IntervalPartition(IntervalPartition &IP, bool)
+  : FunctionPass((intptr_t) &ID) {
   Interval *FunctionStart = IP.getRootInterval();
   assert(FunctionStart && "Cannot operate on empty IntervalPartitions!");
 
@@ -96,12 +102,13 @@ IntervalPartition::IntervalPartition(IntervalPartition &IP, bool) {
 
   ++I;  // After the first one...
 
-  // Add the rest of the intervals to the partition...
-  for_each(I, intervals_end(IP),
-	   bind_obj(this, &IntervalPartition::addIntervalToPartition));
+  // Add the rest of the intervals to the partition.
+  for (interval_part_interval_iterator E = intervals_end(IP); I != E; ++I)
+    addIntervalToPartition(*I);
 
-  // Now that we know all of the successor information, propogate this to the
-  // predecessors for each block...
-  for_each(Intervals.begin(), Intervals.end(), 
-	   bind_obj(this, &IntervalPartition::updatePredecessors));
+  // Now that we know all of the successor information, propagate this to the
+  // predecessors for each block.
+  for (unsigned i = 0, e = Intervals.size(); i != e; ++i)
+    updatePredecessors(Intervals[i]);
 }
+