From 22bca4dfb05b1b8079f08deac5b3cf1a6bc2568b Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 1 Oct 2003 22:28:00 +0000 Subject: [PATCH] Use graph traits to perform generic interval construction git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8809 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Analysis/IntervalIterator.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/llvm/Analysis/IntervalIterator.h b/include/llvm/Analysis/IntervalIterator.h index 0943eda7037..2b155584683 100644 --- a/include/llvm/Analysis/IntervalIterator.h +++ b/include/llvm/Analysis/IntervalIterator.h @@ -76,7 +76,8 @@ inline void addNodeToInterval(Interval *Int, Interval *I) { -template +template, + class IGT = GraphTraits > > class IntervalIterator { std::stack > IntStack; std::set Visited; @@ -163,8 +164,8 @@ private: Visited.insert(Header); // The header has now been visited! // Check all of our successors to see if they are in the interval... - for (typename NodeTy::succ_iterator I = succ_begin(Node), - E = succ_end(Node); I != E; ++I) + for (typename GT::ChildIteratorType I = GT::child_begin(Node), + E = GT::child_end(Node); I != E; ++I) ProcessNode(Int, getSourceGraphNode(OrigContainer, *I)); IntStack.push(make_pair(Int, succ_begin(Int))); @@ -194,8 +195,8 @@ private: Int->Successors.push_back(NodeHeader); } } else { // Otherwise, not in interval yet - for (typename NodeTy::pred_iterator I = pred_begin(Node), - E = pred_end(Node); I != E; ++I) { + for (typename IGT::ChildIteratorType I = IGT::child_begin(Node), + E = IGT::child_end(Node); I != E; ++I) { if (!Int->contains(*I)) { // If pred not in interval, we can't be if (!Int->isSuccessor(NodeHeader)) // Add only if not already in set Int->Successors.push_back(NodeHeader); @@ -217,8 +218,8 @@ private: // Now that we have discovered that Node is in the interval, perhaps some // of its successors are as well? - for (typename NodeTy::succ_iterator It = succ_begin(Node), - End = succ_end(Node); It != End; ++It) + for (typename GT::ChildIteratorType It = GT::child_begin(Node), + End = GT::child_end(Node); It != End; ++It) ProcessNode(Int, getSourceGraphNode(OrigContainer, *It)); } }