[BOLT][NFC] Remove BB::getBranchInfo accepting MCSymbol ptr

[rafauler]

LGTM

bolt/include/bolt/Core/BinaryBasicBlock.h

public:
   };
 
   /// Return branch info corresponding to an edge going to \p Succ basic block.
   BinaryBranchInfo &getBranchInfo(const BinaryBasicBlock &Succ);
 
   /// Return branch info corresponding to an edge going to \p Succ basic block.
   const BinaryBranchInfo &getBranchInfo(const BinaryBasicBlock &Succ) const;
 
-  /// Return branch info corresponding to an edge going to a basic block with
-  /// label \p Label.
-  BinaryBranchInfo &getBranchInfo(const MCSymbol *Label);
-
   /// Set branch information for the outgoing edge to block \p Succ.
   void setSuccessorBranchInfo(const BinaryBasicBlock &Succ, uint64_t Count,
                               uint64_t MispredictedCount) {
     BinaryBranchInfo &BI = getBranchInfo(Succ);
     BI.Count = Count;
     BI.MispredictedCount = MispredictedCount;
   }
 

bolt/lib/Core/BinaryBasicBlock.cpp

 BinaryBasicBlock::getBranchInfo(const BinaryBasicBlock &Succ) const {
   const auto Zip = llvm::zip(successors(), branch_info());
   const auto Result = llvm::find_if(
       Zip, [&](const auto &Tuple) { return std::get<0>(Tuple) == &Succ; });
   assert(Result != Zip.end() && "Cannot find target in successors");
   return std::get<1>(*Result);
 }
 
-BinaryBasicBlock::BinaryBranchInfo &
-BinaryBasicBlock::getBranchInfo(const MCSymbol *Label) {
-  auto BI = branch_info_begin();
-  for (BinaryBasicBlock *BB : successors()) {
-    if (BB->getLabel() == Label)
-      return *BI;
-    ++BI;
-  }
-
-  llvm_unreachable("Invalid successor");
-  return *BI;
-}
-
 BinaryBasicBlock *BinaryBasicBlock::splitAt(iterator II) {
   assert(II != end() && "expected iterator pointing to instruction");
 
   BinaryBasicBlock *NewBlock = getFunction()->addBasicBlock();
 
   // Adjust successors/predecessors and propagate the execution count.
   moveAllSuccessorsTo(NewBlock);
   addSuccessor(NewBlock, getExecutionCount(), 0);

bolt/lib/Passes/IndirectCallPromotion.cpp

if (const JumpTable *JT = BF.getJumpTable(Inst)) {
     JumpTable::JumpInfo DefaultJI;
     const JumpTable::JumpInfo *JI =
         JT->Counts.empty() ? &DefaultJI : &JT->Counts[Range.first];
     const size_t JIAdj = JT->Counts.empty() ? 0 : 1;
     assert(JT->Type == JumpTable::JTT_PIC ||
            JT->EntrySize == BC.AsmInfo->getCodePointerSize());
     for (size_t I = Range.first; I < Range.second; ++I, JI += JIAdj) {
       MCSymbol *Entry = JT->Entries[I];
-      assert(BF.getBasicBlockForLabel(Entry) ||
-             Entry == BF.getFunctionEndLabel() ||
+      const BinaryBasicBlock *ToBB = BF.getBasicBlockForLabel(Entry);
+      assert(ToBB || Entry == BF.getFunctionEndLabel() ||
              Entry == BF.getFunctionEndLabel(FragmentNum::cold()));
       if (Entry == BF.getFunctionEndLabel() ||
           Entry == BF.getFunctionEndLabel(FragmentNum::cold()))
         continue;
       const Location To(Entry);
-      const BinaryBasicBlock::BinaryBranchInfo &BI = BB.getBranchInfo(Entry);
+      const BinaryBasicBlock::BinaryBranchInfo &BI = BB.getBranchInfo(*ToBB);
       Targets.emplace_back(From, To, BI.MispredictedCount, BI.Count,
                            I - Range.first);
     }
 
     // Sort by symbol then addr.
     llvm::sort(Targets, [](const Callsite &A, const Callsite &B) {
       if (A.To.Sym && B.To.Sym)
         return A.To.Sym < B.To.Sym;