Fix a bug that prevented PRE from applying in some cases.

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

diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp
index 42fbc78671e228e4993f1effb24c459c32252e89..b258fcc08c0423d5d68ff93e958d5ca94429ec50 100644 (file)
--- a/lib/Transforms/Scalar/GVN.cpp
+++ b/lib/Transforms/Scalar/GVN.cpp
@@ -1131,9 +1131,11 @@ bool GVN::runOnFunction(Function& F) {
   }
   
   if (EnablePRE) {
-    bool PREChanged = false;
-    while ((PREChanged = performPRE(F)))
+    bool PREChanged = true;
+    while (PREChanged) {
+      PREChanged = performPRE(F);
       changed |= PREChanged;
+    }
   }
   
   return changed;
@@ -1256,7 +1258,7 @@ bool GVN::performPRE(Function& F) {
       unsigned succNum = 0;
       for (unsigned i = 0, e = PREPred->getTerminator()->getNumSuccessors();
            i != e; ++i)
-        if (PREPred->getTerminator()->getSuccessor(i) == PREPred) {
+        if (PREPred->getTerminator()->getSuccessor(i) == CurrentBlock) {
           succNum = i;
           break;
         }