[llvm-branch-commits] [llvm-branch] r71036 - in /llvm/branches/Apple/Dib: lib/CodeGen/IfConversion.cpp lib/CodeGen/MachineBasicBlock.cpp test/CodeGen/X86/omit-label.ll

[Bill Wendling]

Author: void
Date: Tue May  5 18:09:16 2009
New Revision: 71036

URL: http://llvm.org/viewvc/llvm-project?rev=71036&view=rev
Log:
--- Merging r71018 into '.':
A    test/CodeGen/X86/omit-label.ll
U    lib/CodeGen/IfConversion.cpp
U    lib/CodeGen/MachineBasicBlock.cpp


Added:
    llvm/branches/Apple/Dib/test/CodeGen/X86/omit-label.ll
      - copied unchanged from r71018, llvm/trunk/test/CodeGen/X86/omit-label.ll
Modified:
    llvm/branches/Apple/Dib/lib/CodeGen/IfConversion.cpp
    llvm/branches/Apple/Dib/lib/CodeGen/MachineBasicBlock.cpp

Modified: llvm/branches/Apple/Dib/lib/CodeGen/IfConversion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/CodeGen/IfConversion.cpp?rev=71036&r1=71035&r2=71036&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/CodeGen/IfConversion.cpp (original)
+++ llvm/branches/Apple/Dib/lib/CodeGen/IfConversion.cpp Tue May  5 18:09:16 2009
@@ -1174,8 +1174,7 @@
     // Fallthrough edge can't be transferred.
     if (Succ == FallThrough)
       continue;
-    if (!ToBBI.BB->isSuccessor(Succ))
-      ToBBI.BB->addSuccessor(Succ);
+    ToBBI.BB->addSuccessor(Succ);
   }
 
   std::copy(FromBBI.Predicate.begin(), FromBBI.Predicate.end(),
@@ -1215,12 +1214,11 @@
     if (Succ == FallThrough)
       continue;
     FromBBI.BB->removeSuccessor(Succ);
-    if (!ToBBI.BB->isSuccessor(Succ))
-      ToBBI.BB->addSuccessor(Succ);
+    ToBBI.BB->addSuccessor(Succ);
   }
 
   // Now FromBBI always fall through to the next block!
-  if (NBB && !FromBBI.BB->isSuccessor(NBB))
+  if (NBB)
     FromBBI.BB->addSuccessor(NBB);
 
   std::copy(FromBBI.Predicate.begin(), FromBBI.Predicate.end(),

Modified: llvm/branches/Apple/Dib/lib/CodeGen/MachineBasicBlock.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/CodeGen/MachineBasicBlock.cpp?rev=71036&r1=71035&r2=71036&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/CodeGen/MachineBasicBlock.cpp (original)
+++ llvm/branches/Apple/Dib/lib/CodeGen/MachineBasicBlock.cpp Tue May  5 18:09:16 2009
@@ -305,11 +305,9 @@
         I->getOperand(i).setMBB(New);
   }
 
-  // Update the successor information.  If New was already a successor, just
-  // remove the link to Old instead of creating another one.  PR 1444.
+  // Update the successor information.
   removeSuccessor(Old);
-  if (!isSuccessor(New))
-    addSuccessor(New);
+  addSuccessor(New);
 }
 
 /// CorrectExtraCFGEdges - Various pieces of code can cause excess edges in the