[llvm-commits] [poolalloc] r56869 - in /poolalloc/trunk: include/poolalloc/PoolAllocate.h lib/PoolAllocate/PASimple.cpp

[John Criswell]

Author: criswell
Date: Tue Sep 30 14:04:05 2008
New Revision: 56869

URL: http://llvm.org/viewvc/llvm-project?rev=56869&view=rev
Log:
Fixed problem where we grabbed the equivalence classes from the wrong pass.
Made GlobalECs an object local variable so that the values should exit even
if the DSA results are invalidated.

Modified:
    poolalloc/trunk/include/poolalloc/PoolAllocate.h
    poolalloc/trunk/lib/PoolAllocate/PASimple.cpp

Modified: poolalloc/trunk/include/poolalloc/PoolAllocate.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc/PoolAllocate.h?rev=56869&r1=56868&r2=56869&view=diff

==============================================================================
--- poolalloc/trunk/include/poolalloc/PoolAllocate.h (original)
+++ poolalloc/trunk/include/poolalloc/PoolAllocate.h Tue Sep 30 14:04:05 2008
@@ -366,7 +366,7 @@
 class PoolAllocateSimple : public PoolAllocate {
   Value * TheGlobalPool;
   DSGraph * CombinedDSGraph;
-  EquivalenceClasses<GlobalValue*> * GlobalECs;
+  EquivalenceClasses<GlobalValue*> GlobalECs;
   TargetData * TD;
 public:
   static char ID;

Modified: poolalloc/trunk/lib/PoolAllocate/PASimple.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PASimple.cpp?rev=56869&r1=56868&r2=56869&view=diff

==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PASimple.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PASimple.cpp Tue Sep 30 14:04:05 2008
@@ -120,8 +120,8 @@
   //
   // Merge all of the DSNodes in the DSGraphs.
   //
-  GlobalECs = &(TDGraphs->getGlobalECs());
-  CombinedDSGraph = new DSGraph (*GlobalECs, TD, &(ECGraphs->getGlobalsGraph()));
+  GlobalECs = ECGraphs->getGlobalECs();
+  CombinedDSGraph = new DSGraph (GlobalECs, TD, &(ECGraphs->getGlobalsGraph()));
   //CombinedDSGraph.cloneInto (getGlobalsGraph());
   for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) {
     if (ECGraphs->hasGraph (*I))