ARM label operands can be quoted.

[oota-llvm.git] / lib / CodeGen / MachineBlockPlacement.cpp

diff --git a/lib/CodeGen/MachineBlockPlacement.cpp b/lib/CodeGen/MachineBlockPlacement.cpp
index 043a884f6d4e545e69a7b2771cc4b1f61b308028..21582b94c5320a9318ed2397172c9038f5bb8459 100644 (file)
--- a/lib/CodeGen/MachineBlockPlacement.cpp
+++ b/lib/CodeGen/MachineBlockPlacement.cpp
@@ -287,10 +287,8 @@ void MachineBlockPlacement::mergeSuccessor(MachineBasicBlock *BB,
     return;
 
   // Walk through the successors looking for the highest probability edge.
-  // FIXME: This is an annoying way to do the comparison, but it's correct.
-  // Support should be added to BranchProbability to properly compare two.
   MachineBasicBlock *Successor = 0;
-  BlockFrequency BestFreq;
+  BranchProbability BestProb = BranchProbability::getZero();
   DEBUG(dbgs() << "Attempting merge from: " << getBlockName(BB) << "\n");
   for (MachineBasicBlock::succ_iterator SI = BB->succ_begin(),
                                         SE = BB->succ_end();
@@ -298,13 +296,12 @@ void MachineBlockPlacement::mergeSuccessor(MachineBasicBlock *BB,
     if (BB == *SI || (Filter && !Filter->count(*SI)))
       continue;
 
-    BlockFrequency SuccFreq(BlockFrequency::getEntryFrequency());
-    SuccFreq *= MBPI->getEdgeProbability(BB, *SI);
-    DEBUG(dbgs() << "    " << getBlockName(*SI) << " -> " << SuccFreq << "\n");
-    if (!Successor || SuccFreq > BestFreq || (!(SuccFreq < BestFreq) &&
+    BranchProbability SuccProb = MBPI->getEdgeProbability(BB, *SI);
+    DEBUG(dbgs() << "    " << getBlockName(*SI) << " -> " << SuccProb << "\n");
+    if (!Successor || SuccProb > BestProb || (!(SuccProb < BestProb) &&
                                               BB->isLayoutSuccessor(*SI))) {
       Successor = *SI;
-      BestFreq = SuccFreq;
+      BestProb = SuccProb;
     }
   }
   if (!Successor)
@@ -398,9 +395,8 @@ void MachineBlockPlacement::buildCFGChains(MachineFunction &F) {
 
 void MachineBlockPlacement::placeChainsTopologically(MachineFunction &F) {
   MachineBasicBlock *EntryB = &F.front();
-  BlockChain *EntryChain = BlockToChain[EntryB];
-  assert(EntryChain && "Missing chain for entry block");
-  assert(*EntryChain->begin() == EntryB &&
+  assert(BlockToChain[EntryB] && "Missing chain for entry block");
+  assert(*BlockToChain[EntryB]->begin() == EntryB &&
          "Entry block is not the head of the entry block chain");
 
   // Walk the blocks in RPO, and insert each block for a chain in order the