[llvm-commits] [llvm] r60604 - /llvm/trunk/lib/Transforms/Scalar/GVN.cpp

[Anton Korobeynikov]

Author: asl
Date: Fri Dec  5 13:38:49 2008
New Revision: 60604

URL: http://llvm.org/viewvc/llvm-project?rev=60604&view=rev
Log:
Revert invalid r60393. It causes llvm-gcc bootstrap fails in release builds.
See PR3160 for details

Modified:
    llvm/trunk/lib/Transforms/Scalar/GVN.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=60604&r1=60603&r2=60604&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Fri Dec  5 13:38:49 2008
@@ -1484,7 +1484,6 @@
         
       if (isCriticalEdge(PREPred->getTerminator(), succNum)) {
         toSplit.push_back(std::make_pair(PREPred->getTerminator(), succNum));
-        Changed = true;
         continue;
       }
       
@@ -1547,14 +1546,10 @@
   }
   
   for (SmallVector<std::pair<TerminatorInst*, unsigned>, 4>::iterator
-       I = toSplit.begin(), E = toSplit.end(); I != E; ++I) {
+       I = toSplit.begin(), E = toSplit.end(); I != E; ++I)
     SplitCriticalEdge(I->first, I->second, this);
-    BasicBlock* NewBlock = I->first->getSuccessor(I->second);
-    localAvail[NewBlock] =
-             new ValueNumberScope(localAvail[I->first->getParent()]);
-  }
   
-  return Changed;
+  return Changed || toSplit.size();
 }
 
 // iterateOnFunction - Executes one iteration of GVN