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

[Chris Lattner]

Changes in directory llvm/lib/Analysis/DataStructure:

DataStructure.cpp updated: 1.171 -> 1.172

---
Log message:

Fix a tiny bug that caused an incorrect assertion failure poolallocating
boxed-sim.


---
Diffs of the changes:  (+6 -4)

Index: llvm/lib/Analysis/DataStructure/DataStructure.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.171 llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.172
--- llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.171	Tue Mar  9 13:37:06 2004
+++ llvm/lib/Analysis/DataStructure/DataStructure.cpp	Fri Mar 12 19:14:23 2004
@@ -1970,10 +1970,12 @@
   DSNodeHandle &Entry = NodeMap[N1];
   if (Entry.getNode()) {
     // Termination of recursion!
-    assert(!StrictChecking ||
-           (Entry.getNode() == N2 &&
-            Entry.getOffset() == (NH2.getOffset()-NH1.getOffset())) &&
-           "Inconsistent mapping detected!");
+    if (StrictChecking) {
+      assert(Entry.getNode() == N2 && "Inconsistent mapping detected!");
+      assert((Entry.getOffset() == (NH2.getOffset()-NH1.getOffset()) ||
+              Entry.getNode()->isNodeCompletelyFolded()) &&
+             "Inconsistent mapping detected!");
+    }
     return;
   }