[llvm-commits] [poolalloc] r155806 - /poolalloc/trunk/lib/DSA/Local.cpp

[Will Dietz]

Author: wdietz2
Date: Sun Apr 29 20:16:44 2012
New Revision: 155806

URL: http://llvm.org/viewvc/llvm-project?rev=155806&view=rev
Log:
Fix assert to handle case where node is already collapsed.

Fixes 2012-04-29.GlobalInitCollapse.ll.

Modified:
    poolalloc/trunk/lib/DSA/Local.cpp

Modified: poolalloc/trunk/lib/DSA/Local.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=155806&r1=155805&r2=155806&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/Local.cpp (original)
+++ poolalloc/trunk/lib/DSA/Local.cpp Sun Apr 29 20:16:44 2012
@@ -1228,7 +1228,8 @@
         // will point into a different offset into that DSNode.
         //
         DSNodeHandle NewNH (NHN, offset);
-        assert ((NewNH.getOffset() == offset) && "Need to resize DSNode!\n");
+        assert ((NHN->isNodeCompletelyFolded() || (NewNH.getOffset() == offset))
+                && "Need to resize DSNode!");
 
         //
         // Recursively merge in this element of the constant struture into the