Prep for merging 3.4: Undo changes from 3.3 branch

lib/Target/PowerPC/PPCBranchSelector.cpp

 //===-- PPCBranchSelector.cpp - Emit long conditional branches ------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file contains a pass that scans a machine function to determine which
@@ skipping 94 matching lines @@
   while (MadeChange) {
     // Iteratively expand branches until we reach a fixed point.
     MadeChange = false;
   
     for (MachineFunction::iterator MFI = Fn.begin(), E = Fn.end(); MFI != E;
          ++MFI) {
       MachineBasicBlock &MBB = *MFI;
       unsigned MBBStartOffset = 0;
       for (MachineBasicBlock::iterator I = MBB.begin(), E = MBB.end();
            I != E; ++I) {
-        MachineBasicBlock *Dest = 0;
-        if (I->getOpcode() == PPC::BCC && !I->getOperand(2).isImm())
-          Dest = I->getOperand(2).getMBB();
-        else if ((I->getOpcode() == PPC::BDNZ8 || I->getOpcode() == PPC::BDNZ ||
-                  I->getOpcode() == PPC::BDZ8  || I->getOpcode() == PPC::BDZ) &&
-                 !I->getOperand(0).isImm())
-          Dest = I->getOperand(0).getMBB();
-
-        if (!Dest) {
+        if (I->getOpcode() != PPC::BCC || I->getOperand(2).isImm()) {
           MBBStartOffset += TII->GetInstSizeInBytes(I);
           continue;
         }
         
         // Determine the offset from the current branch to the destination
         // block.
+        MachineBasicBlock *Dest = I->getOperand(2).getMBB();
+        
         int BranchSize;
         if (Dest->getNumber() <= MBB.getNumber()) {
           // If this is a backwards branch, the delta is the offset from the
           // start of this block to this branch, plus the sizes of all blocks
           // from this block to the dest.
           BranchSize = MBBStartOffset;
           
           for (unsigned i = Dest->getNumber(), e = MBB.getNumber(); i != e; ++i)
             BranchSize += BlockSizes[i];
         } else {
@@ skipping 52 matching lines @@
         MadeChange = true;
       }
     }
     EverMadeChange |= MadeChange;
   }
   
   BlockSizes.clear();
   return true;
 }