The tarjan iterator now returns a reference to the current SCC, not a possibly null...

[oota-llvm.git] / lib / Analysis / IntervalPartition.cpp

diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp
index f820d7ad1671fa258a319cd008dd8756ce8244f3..9b9010f167e7a304ed844a355c73acdff2b4bb55 100644 (file)
--- a/lib/Analysis/IntervalPartition.cpp
+++ b/lib/Analysis/IntervalPartition.cpp
@@ -1,23 +1,32 @@
 //===- IntervalPartition.cpp - Interval Partition module code ----*- C++ -*--=//
 //
-// This file contains the definition of the cfg::IntervalPartition class, which
-// calculates and represent the interval partition of a method.
+// This file contains the definition of the IntervalPartition class, which
+// calculates and represent the interval partition of a function.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/IntervalIterator.h"
+#include "Support/STLExtras.h"
 
-using namespace cfg;
+using std::make_pair;
+
+static RegisterAnalysis<IntervalPartition>
+X("intervals", "Interval Partition Construction", true);
 
 //===----------------------------------------------------------------------===//
 // IntervalPartition Implementation
 //===----------------------------------------------------------------------===//
 
-template <class T> static inline void deleter(T *Ptr) { delete Ptr; }
+// destroy - Reset state back to before function was analyzed
+void IntervalPartition::destroy() {
+  for_each(Intervals.begin(), Intervals.end(), deleter<Interval>);
+  IntervalMap.clear();
+  RootInterval = 0;
+}
 
-// Destructor - Free memory
-IntervalPartition::~IntervalPartition() {
-  for_each(begin(), end(), deleter<cfg::Interval>);
+void IntervalPartition::print(std::ostream &O) const {
+  std::copy(Intervals.begin(), Intervals.end(),
+            std::ostream_iterator<const Interval *>(O, "\n"));
 }
 
 // addIntervalToPartition - Add an interval to the internal list of intervals,
@@ -25,7 +34,7 @@ IntervalPartition::~IntervalPartition() {
 // interval itself (in the IntervalMap).
 //
 void IntervalPartition::addIntervalToPartition(Interval *I) {
-  IntervalList.push_back(I);
+  Intervals.push_back(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();
@@ -35,10 +44,10 @@ void IntervalPartition::addIntervalToPartition(Interval *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(cfg::Interval *Int) {
+void IntervalPartition::updatePredecessors(Interval *Int) {
   BasicBlock *Header = Int->getHeaderNode();
   for (Interval::succ_iterator I = Int->Successors.begin(), 
                               E = Int->Successors.end(); I != E; ++I)
@@ -46,25 +55,26 @@ void IntervalPartition::updatePredecessors(cfg::Interval *Int) {
 }
 
 // IntervalPartition ctor - Build the first level interval partition for the
-// specified method...
+// specified function...
 //
-IntervalPartition::IntervalPartition(Method *M) {
-  assert(M->getBasicBlocks().front() && "Cannot operate on prototypes!");
-
+bool IntervalPartition::runOnFunction(Function &F) {
   // Pass false to intervals_begin because we take ownership of it's memory
-  method_interval_iterator I = intervals_begin(M, false);
-  method_interval_iterator End = intervals_end(M);
-  assert(I != End && "No intervals in method!?!?!");
+  function_interval_iterator I = intervals_begin(&F, false);
+  assert(I != intervals_end(&F) && "No intervals in function!?!?!");
 
   addIntervalToPartition(RootInterval = *I);
 
-  for (++I; I != End; ++I)
-    addIntervalToPartition(*I);
+  ++I;  // After the first one...
 
-  // Now that we know all of the successor information, propogate this to the
+  // Add the rest of the intervals to the partition...
+  for_each(I, intervals_end(&F),
+          bind_obj(this, &IntervalPartition::addIntervalToPartition));
+
+  // Now that we know all of the successor information, propagate this to the
   // predecessors for each block...
-  for(iterator It = begin(), E = end(); It != E; ++It)
-    updatePredecessors(*It);
+  for_each(Intervals.begin(), Intervals.end(), 
+          bind_obj(this, &IntervalPartition::updatePredecessors));
+  return false;
 }
 
 
@@ -73,21 +83,23 @@ IntervalPartition::IntervalPartition(Method *M) {
 // distinguish it from a copy constructor.  Always pass in false for now.
 //
 IntervalPartition::IntervalPartition(IntervalPartition &IP, bool) {
-  Interval *MethodStart = IP.getRootInterval();
-  assert(MethodStart && "Cannot operate on empty IntervalPartitions!");
+  Interval *FunctionStart = IP.getRootInterval();
+  assert(FunctionStart && "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);
-  interval_part_interval_iterator End = intervals_end(IP);
-  assert(I != End && "No intervals in interval partition!?!?!");
+  assert(I != intervals_end(IP) && "No intervals in interval partition!?!?!");
 
   addIntervalToPartition(RootInterval = *I);
 
-  for (++I; I != End; ++I)
-    addIntervalToPartition(*I);
+  ++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));
 
-  // Now that we know all of the successor information, propogate this to the
+  // Now that we know all of the successor information, propagate this to the
   // predecessors for each block...
-  for(iterator I = begin(), E = end(); I != E; ++I)
-    updatePredecessors(*I);
+  for_each(Intervals.begin(), Intervals.end(), 
+          bind_obj(this, &IntervalPartition::updatePredecessors));
 }