From 767a033a5cc6a8003d72a7a243cb60d9bae674d3 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 6 Dec 2005 07:05:27 +0000 Subject: [PATCH] Implement external storage for post-order iteration, implementing PR267 Patch by Saem Ghani, thanks! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24617 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/PostOrderIterator.h | 94 +++++++++++++++++++++++++--- 1 file changed, 84 insertions(+), 10 deletions(-) diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h index 70abd5f366d..a0ff051542c 100644 --- a/include/llvm/ADT/PostOrderIterator.h +++ b/include/llvm/ADT/PostOrderIterator.h @@ -23,8 +23,26 @@ namespace llvm { -template > -class po_iterator : public forward_iterator { +template // Non-external set +class po_iterator_storage { +public: + SetType Visited; +}; + +template +class po_iterator_storage { +public: + po_iterator_storage(SetType &VSet) : Visited(VSet) {} + po_iterator_storage(const po_iterator_storage &S) : Visited(S.Visited) {} + SetType &Visited; +}; + +template::NodeType*>, + bool ExtStorage = false, + class GT = GraphTraits > +class po_iterator : public forward_iterator, + public po_iterator_storage { typedef forward_iterator super; typedef typename GT::NodeType NodeType; typedef typename GT::ChildIteratorType ChildItTy; @@ -37,27 +55,45 @@ class po_iterator : public forward_iterator { void traverseChild() { while (VisitStack.top().second != GT::child_end(VisitStack.top().first)) { NodeType *BB = *VisitStack.top().second++; - if (!Visited.count(BB)) { // If the block is not visited... - Visited.insert(BB); + if (!this->Visited.count(BB)) { // If the block is not visited... + this->Visited.insert(BB); VisitStack.push(std::make_pair(BB, GT::child_begin(BB))); } } } inline po_iterator(NodeType *BB) { - Visited.insert(BB); + this->Visited.insert(BB); VisitStack.push(std::make_pair(BB, GT::child_begin(BB))); traverseChild(); } - inline po_iterator() { /* End is when stack is empty */ } + inline po_iterator() {} // End is when stack is empty. + + inline po_iterator(NodeType *BB, SetType &S) : + po_iterator_storage(&S) { + if(!S.count(BB)) { + this->Visited.insert(BB); + VisitStack.push(std::make_pair(BB, GT::child_begin(BB))); + traverseChild(); + } + } + + inline po_iterator(SetType &S) : + po_iterator_storage(&S) { + } // End is when stack is empty. public: typedef typename super::pointer pointer; - typedef po_iterator _Self; + typedef po_iterator _Self; // Provide static "constructors"... static inline _Self begin(GraphT G) { return _Self(GT::getEntryNode(G)); } static inline _Self end (GraphT G) { return _Self(); } + static inline _Self begin(GraphT G, SetType &S) { + return _Self(GT::getEntryNode(G), S); + } + static inline _Self end (GraphT G, SetType &S) { return _Self(S); } + inline bool operator==(const _Self& x) const { return VisitStack == x.VisitStack; } @@ -92,10 +128,30 @@ po_iterator po_begin(T G) { return po_iterator::begin(G); } template po_iterator po_end (T G) { return po_iterator::end(G); } +// Provide global definitions of external postorder iterators... +template::NodeType*> > +struct po_ext_iterator : public po_iterator { + po_ext_iterator(const po_iterator &V) : + po_iterator(V) {} +}; + +template +po_ext_iterator po_ext_begin(T G, SetType &S) { + return po_ext_iterator::begin(G, S); +} + +template +po_ext_iterator po_ext_end(T G, SetType &S) { + return po_ext_iterator::end(G, S); +} + // Provide global definitions of inverse post order iterators... -template -struct ipo_iterator : public po_iterator > { - ipo_iterator(const po_iterator > &V) :po_iterator >(V){} +template ::NoddeType*>, + bool External = false> +struct ipo_iterator : public po_iterator, SetType, External > { + ipo_iterator(const po_iterator, SetType, External> &V) : + po_iterator, SetType, External> (V) {} }; template @@ -108,6 +164,24 @@ ipo_iterator ipo_end(T G){ return ipo_iterator::end(G); } +//Provide global definitions of external inverse postorder iterators... +template ::NodeType*> > +struct ipo_ext_iterator : public ipo_iterator { + ipo_ext_iterator(const ipo_iterator &V) : + ipo_iterator(&V) {} + ipo_ext_iterator(const po_iterator, SetType, true> &V) : + ipo_iterator(&V) {} +}; + +template +ipo_ext_iterator ipo_ext_begin(T G, SetType &S) { + return ipo_ext_iterator::begin(G, S); +} + +template +ipo_ext_iterator ipo_ext_end(T G, SetType &S) { + return ipo_ext_iterator::end(G, S); +} //===--------------------------------------------------------------------===// // Reverse Post Order CFG iterator code