Inline DSTypeRec into DSNode

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

diff --git a/include/llvm/Analysis/DSSupport.h b/include/llvm/Analysis/DSSupport.h
index 32aec2c4634ec77617143936ca74749514a048dc..29351cc8e5d1a2b16ae5a432bd1b92dcb2e40b90 100644 (file)
--- a/include/llvm/Analysis/DSSupport.h
+++ b/include/llvm/Analysis/DSSupport.h
@@ -20,7 +20,6 @@ class Type;
 
 class DSNode;                  // Each node in the graph
 class DSGraph;                 // A graph for a function
-class DSNodeIterator;          // Data structure graph traversal iterator
 
 namespace DS { // FIXME: After the paper, this should get cleaned up
   enum { PointerShift = 3,     // 64bit ptrs = 3, 32 bit ptrs = 2
@@ -99,20 +98,6 @@ public:
 
 inline void swap(DSNodeHandle &NH1, DSNodeHandle &NH2) { NH1.swap(NH2); }
 
-//===----------------------------------------------------------------------===//
-/// DSTypeRec - This structure is used to represent a single type that is held
-/// in a DSNode.
-///
-struct DSTypeRec {
-  const Type *Ty;                 // The type itself...
-  bool isArray;                   // Have we accessed an array of elements?
-  
-  DSTypeRec(const Type *T = 0, bool A = false)
-    : Ty(T), isArray(A) {}
-};
-
-
-
 //===----------------------------------------------------------------------===//
 /// DSCallSite - Representation of a call site via its call instruction,
 /// the DSNode handle for the callee function (or function pointer), and

diff --git a/include/llvm/Analysis/DataStructure/DSSupport.h b/include/llvm/Analysis/DataStructure/DSSupport.h
index 32aec2c4634ec77617143936ca74749514a048dc..29351cc8e5d1a2b16ae5a432bd1b92dcb2e40b90 100644 (file)
--- a/include/llvm/Analysis/DataStructure/DSSupport.h
+++ b/include/llvm/Analysis/DataStructure/DSSupport.h
@@ -20,7 +20,6 @@ class Type;
 
 class DSNode;                  // Each node in the graph
 class DSGraph;                 // A graph for a function
-class DSNodeIterator;          // Data structure graph traversal iterator
 
 namespace DS { // FIXME: After the paper, this should get cleaned up
   enum { PointerShift = 3,     // 64bit ptrs = 3, 32 bit ptrs = 2
@@ -99,20 +98,6 @@ public:
 
 inline void swap(DSNodeHandle &NH1, DSNodeHandle &NH2) { NH1.swap(NH2); }
 
-//===----------------------------------------------------------------------===//
-/// DSTypeRec - This structure is used to represent a single type that is held
-/// in a DSNode.
-///
-struct DSTypeRec {
-  const Type *Ty;                 // The type itself...
-  bool isArray;                   // Have we accessed an array of elements?
-  
-  DSTypeRec(const Type *T = 0, bool A = false)
-    : Ty(T), isArray(A) {}
-};
-
-
-
 //===----------------------------------------------------------------------===//
 /// DSCallSite - Representation of a call site via its call instruction,
 /// the DSNode handle for the callee function (or function pointer), and