commit f657309e576b833fe71e8e79d8dd4573d3de34c7
author Chris Lattner <sabre@nondot.org> Sat Mar 13 01:14:23 2004 +0000
committer Chris Lattner <sabre@nondot.org> Sat Mar 13 01:14:23 2004 +0000
tree 20ad81ad78b64d1ed4c10e2e716591aff7650add
parent 4574f3aaece8f380033c0443fd642f8215913f46

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

llvm-svn: 12358

poolalloc/lib/DSA/DataStructure.cpp

diff --git a/poolalloc/lib/DSA/DataStructure.cpp b/poolalloc/lib/DSA/DataStructure.cpp
index 34c8089..eff432e 100644
--- a/poolalloc/lib/DSA/DataStructure.cpp
+++ b/poolalloc/lib/DSA/DataStructure.cpp
@@ -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;
   }