X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FADT%2FDepthFirstIterator.h;h=517768f402df9caf03f440906fd06b8c5af258ee;hb=7eaf057e54e9b5f0469057c71d81dcfee90d9e12;hp=c465f4e549eb5df61b200bff2661ad1aaf6965f4;hpb=d0fde30ce850b78371fd1386338350591f9ff494;p=oota-llvm.git

diff --git a/include/llvm/ADT/DepthFirstIterator.h b/include/llvm/ADT/DepthFirstIterator.h
index c465f4e549e..517768f402d 100644
--- a/include/llvm/ADT/DepthFirstIterator.h
+++ b/include/llvm/ADT/DepthFirstIterator.h
@@ -1,13 +1,13 @@
-//===- Support/DepthFirstIterator.h - Depth First iterator ------*- C++ -*-===//
-// 
+//===- llvm/ADT/DepthFirstIterator.h - Depth First iterator -----*- C++ -*-===//
+//
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
 //===----------------------------------------------------------------------===//
 //
-// This file builds on the Support/GraphTraits.h file to build generic depth
+// This file builds on the ADT/GraphTraits.h file to build generic depth
 // first graph iterator.  This file exposes the following functions/types:
 //
 // df_begin/df_end/df_iterator
@@ -30,13 +30,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DEPTHFIRSTITERATOR_H
-#define SUPPORT_DEPTHFIRSTITERATOR_H
+#ifndef LLVM_ADT_DEPTHFIRSTITERATOR_H
+#define LLVM_ADT_DEPTHFIRSTITERATOR_H
 
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
-#include <vector>
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator.h"
+#include "llvm/ADT/SmallPtrSet.h"
 #include <set>
+#include <vector>
 
 namespace llvm {
 
@@ -58,8 +59,8 @@ public:
 
 
 // Generic Depth First Iterator
-template<class GraphT, class SetType = 
-                            std::set<typename GraphTraits<GraphT>::NodeType*>,
+template<class GraphT,
+class SetType = llvm::SmallPtrSet<typename GraphTraits<GraphT>::NodeType*, 8>,
          bool ExtStorage = false, class GT = GraphTraits<GraphT> >
 class df_iterator : public forward_iterator<typename GT::NodeType, ptrdiff_t>,
                     public df_iterator_storage<SetType, ExtStorage> {
@@ -85,7 +86,7 @@ private:
       VisitStack.push_back(std::make_pair(Node, GT::child_begin(Node)));
     }
   }
-  inline df_iterator(SetType &S) 
+  inline df_iterator(SetType &S)
     : df_iterator_storage<SetType, ExtStorage>(S) {
     // End is when stack is empty
   }
@@ -95,24 +96,24 @@ public:
   typedef df_iterator<GraphT, SetType, ExtStorage, GT> _Self;
 
   // Provide static begin and end methods as our public "constructors"
-  static inline _Self begin(GraphT G) {
+  static inline _Self begin(const GraphT& G) {
     return _Self(GT::getEntryNode(G));
   }
-  static inline _Self end(GraphT G) { return _Self(); }
+  static inline _Self end(const GraphT& G) { return _Self(); }
 
   // Static begin and end methods as our public ctors for external iterators
-  static inline _Self begin(GraphT G, SetType &S) {
+  static inline _Self begin(const GraphT& G, SetType &S) {
     return _Self(GT::getEntryNode(G), S);
   }
-  static inline _Self end(GraphT G, SetType &S) { return _Self(S); }
+  static inline _Self end(const GraphT& G, SetType &S) { return _Self(S); }
 
-  inline bool operator==(const _Self& x) const { 
+  inline bool operator==(const _Self& x) const {
     return VisitStack.size() == x.VisitStack.size() &&
            VisitStack == x.VisitStack;
   }
   inline bool operator!=(const _Self& x) const { return !operator==(x); }
 
-  inline pointer operator*() const { 
+  inline pointer operator*() const {
     return VisitStack.back().first;
   }
 
@@ -127,7 +128,7 @@ public:
       std::pair<NodeType *, ChildItTy> &Top = VisitStack.back();
       NodeType *Node = Top.first;
       ChildItTy &It  = Top.second;
-      
+
       while (It != GT::child_end(Node)) {
         NodeType *Next = *It++;
         if (!this->Visited.count(Next)) {  // Has our next sibling been visited?
@@ -137,22 +138,22 @@ public:
           return *this;
         }
       }
-      
+
       // Oops, ran out of successors... go up a level on the stack.
       VisitStack.pop_back();
     } while (!VisitStack.empty());
-    return *this; 
+    return *this;
   }
 
   inline _Self operator++(int) { // Postincrement
-    _Self tmp = *this; ++*this; return tmp; 
+    _Self tmp = *this; ++*this; return tmp;
   }
 
   // nodeVisited - return true if this iterator has already visited the
   // specified node.  This is public, and will probably be used to iterate over
   // nodes that a depth first iteration did not find: ie unreachable nodes.
   //
-  inline bool nodeVisited(NodeType *Node) const { 
+  inline bool nodeVisited(NodeType *Node) const {
     return this->Visited.count(Node) != 0;
   }
 };
@@ -161,12 +162,12 @@ public:
 // Provide global constructors that automatically figure out correct types...
 //
 template <class T>
-df_iterator<T> df_begin(T G) {
+df_iterator<T> df_begin(const T& G) {
   return df_iterator<T>::begin(G);
 }
 
 template <class T>
-df_iterator<T> df_end(T G) {
+df_iterator<T> df_end(const T& G) {
   return df_iterator<T>::end(G);
 }
 
@@ -178,18 +179,19 @@ struct df_ext_iterator : public df_iterator<T, SetTy, true> {
 };
 
 template <class T, class SetTy>
-df_ext_iterator<T, SetTy> df_ext_begin(T G, SetTy &S) {
+df_ext_iterator<T, SetTy> df_ext_begin(const T& G, SetTy &S) {
   return df_ext_iterator<T, SetTy>::begin(G, S);
 }
 
 template <class T, class SetTy>
-df_ext_iterator<T, SetTy> df_ext_end(T G, SetTy &S) {
+df_ext_iterator<T, SetTy> df_ext_end(const T& G, SetTy &S) {
   return df_ext_iterator<T, SetTy>::end(G, S);
 }
 
 
 // Provide global definitions of inverse depth first iterators...
-template <class T, class SetTy = std::set<typename GraphTraits<T>::NodeType*>,
+template <class T,
+  class SetTy = llvm::SmallPtrSet<typename GraphTraits<T>::NodeType*, 8>,
           bool External = false>
 struct idf_iterator : public df_iterator<Inverse<T>, SetTy, External> {
   idf_iterator(const df_iterator<Inverse<T>, SetTy, External> &V)
@@ -197,13 +199,13 @@ struct idf_iterator : public df_iterator<Inverse<T>, SetTy, External> {
 };
 
 template <class T>
-idf_iterator<T> idf_begin(T G) {
-  return idf_iterator<T>::begin(G);
+idf_iterator<T> idf_begin(const T& G) {
+  return idf_iterator<T>::begin(Inverse<T>(G));
 }
 
 template <class T>
-idf_iterator<T> idf_end(T G){
-  return idf_iterator<T>::end(G);
+idf_iterator<T> idf_end(const T& G){
+  return idf_iterator<T>::end(Inverse<T>(G));
 }
 
 // Provide global definitions of external inverse depth first iterators...
@@ -216,13 +218,13 @@ struct idf_ext_iterator : public idf_iterator<T, SetTy, true> {
 };
 
 template <class T, class SetTy>
-idf_ext_iterator<T, SetTy> idf_ext_begin(T G, SetTy &S) {
-  return idf_ext_iterator<T, SetTy>::begin(G, S);
+idf_ext_iterator<T, SetTy> idf_ext_begin(const T& G, SetTy &S) {
+  return idf_ext_iterator<T, SetTy>::begin(Inverse<T>(G), S);
 }
 
 template <class T, class SetTy>
-idf_ext_iterator<T, SetTy> idf_ext_end(T G, SetTy &S) {
-  return idf_ext_iterator<T, SetTy>::end(G, S);
+idf_ext_iterator<T, SetTy> idf_ext_end(const T& G, SetTy &S) {
+  return idf_ext_iterator<T, SetTy>::end(Inverse<T>(G), S);
 }
 
 } // End llvm namespace