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

[Arushi Aggarwal]

Author: aggarwa4
Date: Tue Dec  7 14:17:27 2010
New Revision: 121177

URL: http://llvm.org/viewvc/llvm-project?rev=121177&view=rev
Log:
Revert this change. We need to fully understand 
the cases this can arise in, and handle all of them
before we allow this.

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=121177&r1=121176&r2=121177&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DataStructure.cpp (original)
+++ poolalloc/trunk/lib/DSA/DataStructure.cpp Tue Dec  7 14:17:27 2010
@@ -572,19 +572,10 @@
   if (CurNodeH.getNode()->isArrayNode() && NH.getNode()->isArrayNode()) {
     if(NH.getNode()->getSize() != 0 && CurNodeH.getNode()->getSize() != 0
        && (NH.getNode()->getSize() != CurNodeH.getNode()->getSize())){
-       if(((NH.getNode()->getSize() % CurNodeH.getNode()->getSize()) != 0 ) 
-          && ((CurNodeH.getNode()->getSize() % NH.getNode()->getSize()) != 0)){
         CurNodeH.getNode()->foldNodeCompletely();
         NH.getNode()->foldNodeCompletely();
         NSize = NH.getNode()->getSize();
         NOffset = NH.getOffset();
-      } else {
-        if(NH.getNode()->getSize() > CurNodeH.getNode()->getSize()) {
-          NH.getNode()->mergeArrayTypeInfo(CurNodeH.getNode());
-        } else {
-          CurNodeH.getNode()->mergeArrayTypeInfo(NH.getNode());
-        }
-      }
     }
   }
  
@@ -867,17 +858,8 @@
       if (SN->isArrayNode() && DN->isArrayNode()) {
         if((SN->getSize() != DN->getSize()) && (SN->getSize() != 0) 
            && DN->getSize() != 0) {
-           if(((SN->getSize() % DN->getSize()) != 0) && 
-              ((DN->getSize() % SN->getSize()) != 0)){
              DN->foldNodeCompletely();
              DN = NH.getNode();
-           } else {
-             if(DN->getSize() > SN->getSize()) {
-               DN->mergeArrayTypeInfo(SN);
-             } else {
-               SrcNH.getNode()->mergeArrayTypeInfo(NH.getNode());
-             }
-           }
         }
       }
       if (!DN->isNodeCompletelyFolded() && DN->getSize() < SN->getSize())