Move GlobalDSGraph class defn to the end of the file

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4027 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Analysis/DataStructure.h b/include/llvm/Analysis/DataStructure.h
index 4551b16592a15a0b7d877176300351033dfb3efc..9e081e72c5c236e6768f0e7661e7062ec3e6da68 100644 (file)
--- a/include/llvm/Analysis/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure.h
@@ -13,8 +13,8 @@
 #include "llvm/GlobalValue.h"
 #include "Support/HashExtras.h"
 #include "Support/hash_set"
-#endif
 #include <set>
+#endif
 
 class Type;
 class GlobalValue;
@@ -35,34 +35,6 @@ namespace DataStructureAnalysis {
 }
 
 
-#if 0
-// GlobalDSGraph - A common graph for all the globals and their outgoing links
-// to externally visible nodes.  This includes GlobalValues, New nodes,
-// Cast nodes, and Calls.  This graph can only be used by one of the
-// individual function graphs, and it goes away when they all go away.
-// 
-class GlobalDSGraph : public DSGraph {
-  hash_set<const DSGraph*> Referrers;
-  void addReference(const DSGraph* referrer);
-  void removeReference(const DSGraph* referrer);
-  friend class DSGraph;                           // give access to Referrers
-  
-  GlobalDSGraph(const GlobalDSGraph &GlobalDSG);  // Do not implement
-
-  // Helper function for cloneGlobals and cloneCalls
-  DSNode* cloneNodeInto(DSNode *OldNode,
-                        std::map<const DSNode*, DSNode*> &NodeCache,
-                        bool GlobalsAreFinal = false);
-
-public:
-  GlobalDSGraph();                                // Create an empty DSGraph
-  virtual ~GlobalDSGraph();
-
-  void    cloneGlobals(DSGraph& Graph, bool CloneCalls = false);
-  void    cloneCalls  (DSGraph& Graph);
-};
-#endif
-
 // LocalDataStructures - The analysis that computes the local data structure
 // graphs for all of the functions in the program.
 //
@@ -170,4 +142,32 @@ private:
 };
 #endif
 
+#if 0
+// GlobalDSGraph - A common graph for all the globals and their outgoing links
+// to externally visible nodes.  This includes GlobalValues, New nodes,
+// Cast nodes, and Calls.  This graph can only be used by one of the
+// individual function graphs, and it goes away when they all go away.
+// 
+class GlobalDSGraph : public DSGraph {
+  hash_set<const DSGraph*> Referrers;
+  void addReference(const DSGraph* referrer);
+  void removeReference(const DSGraph* referrer);
+  friend class DSGraph;                           // give access to Referrers
+  
+  GlobalDSGraph(const GlobalDSGraph &GlobalDSG);  // Do not implement
+
+  // Helper function for cloneGlobals and cloneCalls
+  DSNode* cloneNodeInto(DSNode *OldNode,
+                        std::map<const DSNode*, DSNode*> &NodeCache,
+                        bool GlobalsAreFinal = false);
+
+public:
+  GlobalDSGraph();                                // Create an empty DSGraph
+  virtual ~GlobalDSGraph();
+
+  void    cloneGlobals(DSGraph& Graph, bool CloneCalls = false);
+  void    cloneCalls  (DSGraph& Graph);
+};
+#endif
+
 #endif

diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h
index 4551b16592a15a0b7d877176300351033dfb3efc..9e081e72c5c236e6768f0e7661e7062ec3e6da68 100644 (file)
--- a/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -13,8 +13,8 @@
 #include "llvm/GlobalValue.h"
 #include "Support/HashExtras.h"
 #include "Support/hash_set"
-#endif
 #include <set>
+#endif
 
 class Type;
 class GlobalValue;
@@ -35,34 +35,6 @@ namespace DataStructureAnalysis {
 }
 
 
-#if 0
-// GlobalDSGraph - A common graph for all the globals and their outgoing links
-// to externally visible nodes.  This includes GlobalValues, New nodes,
-// Cast nodes, and Calls.  This graph can only be used by one of the
-// individual function graphs, and it goes away when they all go away.
-// 
-class GlobalDSGraph : public DSGraph {
-  hash_set<const DSGraph*> Referrers;
-  void addReference(const DSGraph* referrer);
-  void removeReference(const DSGraph* referrer);
-  friend class DSGraph;                           // give access to Referrers
-  
-  GlobalDSGraph(const GlobalDSGraph &GlobalDSG);  // Do not implement
-
-  // Helper function for cloneGlobals and cloneCalls
-  DSNode* cloneNodeInto(DSNode *OldNode,
-                        std::map<const DSNode*, DSNode*> &NodeCache,
-                        bool GlobalsAreFinal = false);
-
-public:
-  GlobalDSGraph();                                // Create an empty DSGraph
-  virtual ~GlobalDSGraph();
-
-  void    cloneGlobals(DSGraph& Graph, bool CloneCalls = false);
-  void    cloneCalls  (DSGraph& Graph);
-};
-#endif
-
 // LocalDataStructures - The analysis that computes the local data structure
 // graphs for all of the functions in the program.
 //
@@ -170,4 +142,32 @@ private:
 };
 #endif
 
+#if 0
+// GlobalDSGraph - A common graph for all the globals and their outgoing links
+// to externally visible nodes.  This includes GlobalValues, New nodes,
+// Cast nodes, and Calls.  This graph can only be used by one of the
+// individual function graphs, and it goes away when they all go away.
+// 
+class GlobalDSGraph : public DSGraph {
+  hash_set<const DSGraph*> Referrers;
+  void addReference(const DSGraph* referrer);
+  void removeReference(const DSGraph* referrer);
+  friend class DSGraph;                           // give access to Referrers
+  
+  GlobalDSGraph(const GlobalDSGraph &GlobalDSG);  // Do not implement
+
+  // Helper function for cloneGlobals and cloneCalls
+  DSNode* cloneNodeInto(DSNode *OldNode,
+                        std::map<const DSNode*, DSNode*> &NodeCache,
+                        bool GlobalsAreFinal = false);
+
+public:
+  GlobalDSGraph();                                // Create an empty DSGraph
+  virtual ~GlobalDSGraph();
+
+  void    cloneGlobals(DSGraph& Graph, bool CloneCalls = false);
+  void    cloneCalls  (DSGraph& Graph);
+};
+#endif
+
 #endif