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 385de02..6e0296d 100644
--- a/lib/Transforms/Scalar/GVN.cpp
+++ b/lib/Transforms/Scalar/GVN.cpp
@@ -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