Make PointerShift/Size be enums so they are constants instead of globals

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

diff --git a/include/llvm/Analysis/DSSupport.h b/include/llvm/Analysis/DSSupport.h
index acaac37d1c26aee71450309d35052826ca70f541..dfd4bd79764b3ab2c8b988c9a5fca41b17b96654 100644 (file)
--- a/include/llvm/Analysis/DSSupport.h
+++ b/include/llvm/Analysis/DSSupport.h
@@ -22,8 +22,10 @@ class DSNode;                  // Each node in the graph
 class DSGraph;                 // A graph for a function
 class DSNodeIterator;          // Data structure graph traversal iterator
 
-namespace DS {
-  extern const unsigned PointerShift;  // 64bit ptrs = 3, 32 bit ptrs = 2
+namespace DS { // FIXME: After the paper, this should get cleaned up
+  enum { PointerShift = 3,     // 64bit ptrs = 3, 32 bit ptrs = 2
+         PointerSize = 1 << PointerShift
+  };
 };
 
 //===----------------------------------------------------------------------===//

diff --git a/include/llvm/Analysis/DataStructure/DSSupport.h b/include/llvm/Analysis/DataStructure/DSSupport.h
index acaac37d1c26aee71450309d35052826ca70f541..dfd4bd79764b3ab2c8b988c9a5fca41b17b96654 100644 (file)
--- a/include/llvm/Analysis/DataStructure/DSSupport.h
+++ b/include/llvm/Analysis/DataStructure/DSSupport.h
@@ -22,8 +22,10 @@ class DSNode;                  // Each node in the graph
 class DSGraph;                 // A graph for a function
 class DSNodeIterator;          // Data structure graph traversal iterator
 
-namespace DS {
-  extern const unsigned PointerShift;  // 64bit ptrs = 3, 32 bit ptrs = 2
+namespace DS { // FIXME: After the paper, this should get cleaned up
+  enum { PointerShift = 3,     // 64bit ptrs = 3, 32 bit ptrs = 2
+         PointerSize = 1 << PointerShift
+  };
 };
 
 //===----------------------------------------------------------------------===//