[llvm-commits] CVS: llvm/lib/Analysis/DataStructure/DataStructure.cpp

[Chris Lattner]

Changes in directory llvm/lib/Analysis/DataStructure:

DataStructure.cpp updated: 1.43 -> 1.44

---
Log message:

Make PointerSize & Shift be enums
Fix problem with recursive merging



---
Diffs of the changes:

Index: llvm/lib/Analysis/DataStructure/DataStructure.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.43 llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.44
--- llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.43	Wed Nov  6 00:20:09 2002
+++ llvm/lib/Analysis/DataStructure/DataStructure.cpp	Wed Nov  6 12:01:39 2002
@@ -20,11 +20,6 @@
   Statistic<> NumFolds("dsnode", "Number of nodes completely folded");
 };
 
-namespace DS {
-  const unsigned PointerShift = 3;  // 64bit ptrs = 3, 32 bit ptrs = 2
-  const unsigned PointerSize = 1 << PointerShift;
-};
-
 namespace DataStructureAnalysis {   // TODO: FIXME
   // isPointerType - Return true if this first class type is big enough to hold
   // a pointer.
@@ -392,7 +387,7 @@
   }
   N = NH.getNode();
 
-  if (this == N) return;
+  if (this == N || N == 0) return;
 
   // If both nodes are not at offset 0, make sure that we are merging the node
   // at an later offset into the node with the zero offset.