From 13d01086663b261c1236e96057dbb60714657e48 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 22 Feb 2005 23:27:21 +0000 Subject: [PATCH] Remove use of bind_obj, deleter, and finegrainify namespacification. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20277 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/IntervalPartition.cpp | 33 ++++++++++++++---------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp index eb2c06cc64c..dd06501de9a 100644 --- a/lib/Analysis/IntervalPartition.cpp +++ b/lib/Analysis/IntervalPartition.cpp @@ -13,10 +13,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Analysis/IntervalIterator.h" -#include "llvm/ADT/STLExtras.h" -#include - -namespace llvm { +using namespace llvm; static RegisterAnalysis X("intervals", "Interval Partition Construction", true); @@ -27,7 +24,8 @@ X("intervals", "Interval Partition Construction", true); // destroy - Reset state back to before function was analyzed void IntervalPartition::destroy() { - std::for_each(Intervals.begin(), Intervals.end(), deleter); + for (unsigned i = 0, e = Intervals.size(); i != e; ++i) + delete Intervals[i]; IntervalMap.clear(); RootInterval = 0; } @@ -74,14 +72,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, propagate this to the - // predecessors for each block... - for_each(Intervals.begin(), Intervals.end(), - bind_obj(this, &IntervalPartition::updatePredecessors)); + // predecessors for each block. + for (unsigned i = 0, e = Intervals.size(); i != e; ++i) + updatePredecessors(Intervals[i]); return false; } @@ -102,14 +100,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, propagate this to the - // predecessors for each block... - for_each(Intervals.begin(), Intervals.end(), - bind_obj(this, &IntervalPartition::updatePredecessors)); + // predecessors for each block. + for (unsigned i = 0, e = Intervals.size(); i != e; ++i) + updatePredecessors(Intervals[i]); } -} // End llvm namespace