implement NFC feedback

Author: ro-i

llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h

@@ -612,7 +612,7 @@ LLVM_ABI void InvertBranch(BranchInst *PBI, IRBuilderBase &Builder);
 // br/brcond/unreachable/ret
 LLVM_ABI bool hasOnlySimpleTerminator(const Function &F);
 
-LLVM_ABI Printable printBBPtr(const BasicBlock *BB);
+LLVM_ABI Printable printBasicBlock(const BasicBlock *BB);
 
 } // end namespace llvm
 

llvm/lib/Transforms/Utils/BasicBlockUtils.cpp

@@ -1776,7 +1776,7 @@ bool llvm::hasOnlySimpleTerminator(const Function &F) {
   return true;
 }
 
-Printable llvm::printBBPtr(const BasicBlock *BB) {
+Printable llvm::printBasicBlock(const BasicBlock *BB) {
   return Printable([BB](raw_ostream &OS) {
     if (BB)
       return BB->printAsOperand(OS);

llvm/lib/Transforms/Utils/FixIrreducible.cpp

@@ -299,9 +299,10 @@ static bool fixIrreducible(Cycle &C, CycleInfo &CI, DominatorTree &DT,
       assert(Succ0 || Succ1);
       CHub.addBranch(P, Succ0, Succ1);
 
-      LLVM_DEBUG(dbgs() << "Added internal branch: " << printBBPtr(P) << " -> "
-                        << printBBPtr(Succ0) << (Succ0 && Succ1 ? " " : "")
-                        << printBBPtr(Succ1) << "\n");
+      LLVM_DEBUG(dbgs() << "Added internal branch: " << printBasicBlock(P)
+                        << " -> " << printBasicBlock(Succ0)
+                        << (Succ0 && Succ1 ? " " : "") << printBasicBlock(Succ1)
+                        << "\n");
     } else if (CallBrInst *CallBr = dyn_cast<CallBrInst>(P->getTerminator())) {
       for (unsigned I = 0; I < CallBr->getNumSuccessors(); ++I) {
         BasicBlock *Succ = CallBr->getSuccessor(I);
@@ -310,8 +311,9 @@ static bool fixIrreducible(Cycle &C, CycleInfo &CI, DominatorTree &DT,
         BasicBlock *NewSucc = ControlFlowHub::createCallBrTarget(
             CallBr, Succ, I, /* AttachToCallBr = */ false, &CI, &DTU, LI);
         CHub.addBranch(NewSucc, Succ);
-        LLVM_DEBUG(dbgs() << "Added internal branch: " << printBBPtr(NewSucc)
-                          << " -> " << printBBPtr(Succ) << "\n");
+        LLVM_DEBUG(dbgs() << "Added internal branch: "
+                          << printBasicBlock(NewSucc) << " -> "
+                          << printBasicBlock(Succ) << "\n");
       }
     } else {
       llvm_unreachable("unsupported block terminator");
@@ -336,9 +338,10 @@ static bool fixIrreducible(Cycle &C, CycleInfo &CI, DominatorTree &DT,
       Succ1 = Succ1 && C.contains(Succ1) ? Succ1 : nullptr;
       CHub.addBranch(P, Succ0, Succ1);
 
-      LLVM_DEBUG(dbgs() << "Added external branch: " << printBBPtr(P) << " -> "
-                        << printBBPtr(Succ0) << (Succ0 && Succ1 ? " " : "")
-                        << printBBPtr(Succ1) << "\n");
+      LLVM_DEBUG(dbgs() << "Added external branch: " << printBasicBlock(P)
+                        << " -> " << printBasicBlock(Succ0)
+                        << (Succ0 && Succ1 ? " " : "") << printBasicBlock(Succ1)
+                        << "\n");
     } else if (CallBrInst *CallBr = dyn_cast<CallBrInst>(P->getTerminator())) {
       for (unsigned I = 0; I < CallBr->getNumSuccessors(); ++I) {
         BasicBlock *Succ = CallBr->getSuccessor(I);
@@ -347,8 +350,9 @@ static bool fixIrreducible(Cycle &C, CycleInfo &CI, DominatorTree &DT,
         BasicBlock *NewSucc = ControlFlowHub::createCallBrTarget(
             CallBr, Succ, I, /* AttachToCallBr = */ true, &CI, &DTU, LI);
         CHub.addBranch(NewSucc, Succ);
-        LLVM_DEBUG(dbgs() << "Added external branch: " << printBBPtr(NewSucc)
-                          << " -> " << printBBPtr(Succ) << "\n");
+        LLVM_DEBUG(dbgs() << "Added external branch: "
+                          << printBasicBlock(NewSucc) << " -> "
+                          << printBasicBlock(Succ) << "\n");
       }
     } else {
       llvm_unreachable("unsupported block terminator");

llvm/lib/Transforms/Utils/UnifyLoopExits.cpp

@@ -12,7 +12,7 @@
 //
 // Limitation: This assumes that all terminators in the CFG are direct branches
 //             (the "br" instruction). The presence of any other control flow
-//             such as indirectbr ot switch will cause an assert.
+//             such as indirectbr or switch will cause an assert.
 //             The callbr terminator is supported by creating intermediate
 //             target blocks that unconditionally branch to the original target
 //             blocks. These intermediate target blocks can then be redirected
@@ -170,9 +170,10 @@ static bool unifyLoopExits(DominatorTree &DT, LoopInfo &LI, Loop *L) {
       Succ1 = L->contains(Succ1) ? nullptr : Succ1;
       CHub.addBranch(BB, Succ0, Succ1);
 
-      LLVM_DEBUG(dbgs() << "Added extiting branch: " << printBBPtr(BB) << " -> "
-                        << printBBPtr(Succ0) << (Succ0 && Succ1 ? " " : "")
-                        << printBBPtr(Succ1) << "\n");
+      LLVM_DEBUG(dbgs() << "Added extiting branch: " << printBasicBlock(BB)
+                        << " -> " << printBasicBlock(Succ0)
+                        << (Succ0 && Succ1 ? " " : "") << printBasicBlock(Succ1)
+                        << "\n");
     } else if (CallBrInst *CallBr = dyn_cast<CallBrInst>(BB->getTerminator())) {
       for (unsigned J = 0; J < CallBr->getNumSuccessors(); ++J) {
         BasicBlock *Succ = CallBr->getSuccessor(J);
@@ -187,8 +188,9 @@ static bool unifyLoopExits(DominatorTree &DT, LoopInfo &LI, Loop *L) {
         // themselves.
         ExitingBlocks[I] = NewSucc;
         CHub.addBranch(NewSucc, Succ);
-        LLVM_DEBUG(dbgs() << "Added exiting branch: " << printBBPtr(NewSucc)
-                          << " -> " << printBBPtr(Succ) << "\n");
+        LLVM_DEBUG(dbgs() << "Added exiting branch: "
+                          << printBasicBlock(NewSucc) << " -> "
+                          << printBasicBlock(Succ) << "\n");
         // Also add the new target block to the list of exiting blocks that
         // should later be added to the parent loops.
         CallBrTargetBlocks.push_back(NewSucc);