[llvm-commits] [poolalloc] r130322 - /poolalloc/trunk/lib/DSA/DataStructure.cpp

[Arushi Aggarwal]

Author: aggarwa4
Date: Wed Apr 27 14:28:25 2011
New Revision: 130322

URL: http://llvm.org/viewvc/llvm-project?rev=130322&view=rev
Log:
Do not merge type info, if it is a collapsed node, or
if they new type is a void type.

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

Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=130322&r1=130321&r2=130322&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DataStructure.cpp (original)
+++ poolalloc/trunk/lib/DSA/DataStructure.cpp Wed Apr 27 14:28:25 2011
@@ -429,6 +429,8 @@
 /// This method returns true if the node is completely folded, otherwise false.
 ///
 void DSNode::mergeTypeInfo(const Type *NewTy, unsigned Offset) {
+  if (!NewTy || NewTy->isVoidTy()) return;
+  if (isCollapsedNode()) return;
 
   growSizeForType(NewTy, Offset);