If BB is predicated, invalidate its predecessor(s) which would if-convert it. It needs to be re-analyzed.

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

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/CodeGen/IfConversion.cpp b/lib/CodeGen/IfConversion.cpp
index 87340d3700..b1aa31a28e 100644
--- a/lib/CodeGen/IfConversion.cpp
+++ b/lib/CodeGen/IfConversion.cpp
@@ -656,15 +656,19 @@ static bool canFallThroughTo(MachineBasicBlock *BB, MachineBasicBlock *ToBB) {
 }
 
 /// ReTryPreds - Invalidate predecessor BB info so it would be re-analyzed
-/// to determine if it can be if-converted.
+/// to determine if it can be if-converted. If predecessor is already
+/// enqueud, dequeue it!
 void IfConverter::ReTryPreds(MachineBasicBlock *BB) {
   for (MachineBasicBlock::pred_iterator PI = BB->pred_begin(),
          E = BB->pred_end(); PI != E; ++PI) {
     BBInfo &PBBI = BBAnalysis[(*PI)->getNumber()];
-    if (!PBBI.IsDone && PBBI.Kind == ICNotClassfied) {
+    if (PBBI.IsDone)
+      continue;
+    if (PBBI.Kind == ICNotClassfied) {
       assert(!PBBI.IsEnqueued && "Unexpected");
       PBBI.IsAnalyzed = false;
-    }
+    } else if (PBBI.IsEnqueued && PBBI.BB != BB)
+      PBBI.IsEnqueued = false;
   }
 }