From: Anton Korobeynikov <asl@math.spbu.ru>
Date: Fri, 5 Dec 2008 19:38:49 +0000 (+0000)
Subject: Revert invalid r60393. It causes llvm-gcc bootstrap fails in release builds.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=64b535608e03531e0a0a5745724b7e8d819bdd71;p=oota-llvm.git

Revert invalid r60393. It causes llvm-gcc bootstrap fails in release builds.
See PR3160 for details

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60604 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp
index 385de02322f..6e0296d2106 100644
--- a/lib/Transforms/Scalar/GVN.cpp
+++ b/lib/Transforms/Scalar/GVN.cpp
@@ -1484,7 +1484,6 @@ bool GVN::performPRE(Function& F) {
         
       if (isCriticalEdge(PREPred->getTerminator(), succNum)) {
         toSplit.push_back(std::make_pair(PREPred->getTerminator(), succNum));
-        Changed = true;
         continue;
       }
       
@@ -1547,14 +1546,10 @@ bool GVN::performPRE(Function& F) {
   }
   
   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