Apply suggestions from code review

Co-authored-by: Matt Arsenault <[email protected]>

Author: ro-i

llvm/lib/Transforms/Utils/ControlFlowUtils.cpp

@@ -360,7 +360,7 @@ BasicBlock *ControlFlowHub::createCallBrTarget(
   // Jump from the new target block to the original successor.
   BranchInst::Create(Succ, CallBrTarget);
   if (LI) {
-    if (Loop *L = LI->getLoopFor(AttachToCallBr ? CallBrBlock : Succ); L) {
+    if (Loop *L = LI->getLoopFor(AttachToCallBr ? CallBrBlock : Succ)) {
       bool AddToLoop = true;
       if (AttachToCallBr) {
         // Check if the loops are disjoint. In that case, we do not add the

llvm/lib/Transforms/Utils/FixIrreducible.cpp

@@ -290,7 +290,7 @@ static bool fixIrreducible(Cycle &C, CycleInfo &CI, DominatorTree &DT,
   }
 
   for (BasicBlock *P : Predecessors) {
-    if (BranchInst *Branch = dyn_cast<BranchInst>(P->getTerminator()); Branch) {
+    if (BranchInst *Branch = dyn_cast<BranchInst>(P->getTerminator())) {
       // Exactly one of the two successors is the header.
       BasicBlock *Succ0 = Branch->getSuccessor(0) == Header ? Header : nullptr;
       BasicBlock *Succ1 = Succ0 ? nullptr : Header;
@@ -302,20 +302,19 @@ static bool fixIrreducible(Cycle &C, CycleInfo &CI, DominatorTree &DT,
       LLVM_DEBUG(dbgs() << "Added internal branch: " << P->getName() << " -> "
                         << (Succ0 ? Succ0->getName() : "") << " "
                         << (Succ1 ? Succ1->getName() : "") << "\n");
-    } else if (CallBrInst *CallBr = dyn_cast<CallBrInst>(P->getTerminator());
-               CallBr) {
+    } else if (CallBrInst *CallBr = dyn_cast<CallBrInst>(P->getTerminator())) {
       for (unsigned I = 0; I < CallBr->getNumSuccessors(); ++I) {
         BasicBlock *Succ = CallBr->getSuccessor(I);
         if (Succ != Header)
           continue;
-        BasicBlock *NewSucc = llvm::ControlFlowHub::createCallBrTarget(
+        BasicBlock *NewSucc = ControlFlowHub::createCallBrTarget(
             CallBr, Succ, I, false, &CI, &DTU, LI);
         CHub.addBranch(NewSucc, Succ);
         LLVM_DEBUG(dbgs() << "Added internal branch: " << NewSucc->getName()
                           << " -> " << Succ->getName() << "\n");
       }
     } else {
-      llvm_unreachable("Unsupported block terminator.");
+      llvm_unreachable("unsupported block terminator");
     }
   }
 
@@ -340,20 +339,19 @@ static bool fixIrreducible(Cycle &C, CycleInfo &CI, DominatorTree &DT,
       LLVM_DEBUG(dbgs() << "Added external branch: " << P->getName() << " -> "
                         << (Succ0 ? Succ0->getName() : "") << " "
                         << (Succ1 ? Succ1->getName() : "") << "\n");
-    } else if (CallBrInst *CallBr = dyn_cast<CallBrInst>(P->getTerminator());
-               CallBr) {
+    } else if (CallBrInst *CallBr = dyn_cast<CallBrInst>(P->getTerminator())) {
       for (unsigned I = 0; I < CallBr->getNumSuccessors(); ++I) {
         BasicBlock *Succ = CallBr->getSuccessor(I);
         if (!C.contains(Succ))
           continue;
-        BasicBlock *NewSucc = llvm::ControlFlowHub::createCallBrTarget(
+        BasicBlock *NewSucc = ControlFlowHub::createCallBrTarget(
             CallBr, Succ, I, true, &CI, &DTU, LI);
         CHub.addBranch(NewSucc, Succ);
         LLVM_DEBUG(dbgs() << "Added external branch: " << NewSucc->getName()
                           << " -> " << Succ->getName() << "\n");
       }
     } else {
-      llvm_unreachable("Unsupported block terminator.");
+      llvm_unreachable("unsupported block terminator");
     }
   }
 

llvm/lib/Transforms/Utils/UnifyLoopExits.cpp

@@ -161,8 +161,7 @@ static bool unifyLoopExits(DominatorTree &DT, LoopInfo &LI, Loop *L) {
 
   for (unsigned I = 0; I < ExitingBlocks.size(); ++I) {
     BasicBlock *BB = ExitingBlocks[I];
-    if (BranchInst *Branch = dyn_cast<BranchInst>(BB->getTerminator());
-        Branch) {
+    if (BranchInst *Branch = dyn_cast<BranchInst>(BB->getTerminator())) {
       BasicBlock *Succ0 = Branch->getSuccessor(0);
       Succ0 = L->contains(Succ0) ? nullptr : Succ0;
 
@@ -174,8 +173,7 @@ static bool unifyLoopExits(DominatorTree &DT, LoopInfo &LI, Loop *L) {
       LLVM_DEBUG(dbgs() << "Added exiting branch: " << BB->getName() << " -> {"
                         << (Succ0 ? Succ0->getName() : "<none>") << ", "
                         << (Succ1 ? Succ1->getName() : "<none>") << "}\n");
-    } else if (CallBrInst *CallBr = dyn_cast<CallBrInst>(BB->getTerminator());
-               CallBr) {
+    } else if (CallBrInst *CallBr = dyn_cast<CallBrInst>(BB->getTerminator())) {
       for (unsigned J = 0; J < CallBr->getNumSuccessors(); ++J) {
         BasicBlock *Succ = CallBr->getSuccessor(J);
         if (L->contains(Succ))
@@ -196,7 +194,7 @@ static bool unifyLoopExits(DominatorTree &DT, LoopInfo &LI, Loop *L) {
         CallBrTargetBlocks.push_back(NewSucc);
       }
     } else {
-      llvm_unreachable("Unsupported block terminator.");
+      llvm_unreachable("unsupported block terminator");
     }
   }
 

llvm/test/Transforms/FixIrreducible/bug45623.ll

@@ -91,7 +91,7 @@ if.else629:                                       ; preds = %backtrack
   br label %retry
 }
 
-define dso_local void @tre_tnfa_run_backtrack_callbr(i1 %arg) {
+define void @tre_tnfa_run_backtrack_callbr(i1 %arg) {
 ; CHECK-LABEL: @tre_tnfa_run_backtrack_callbr(
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    callbr void asm "", ""()