[clang] [CIR] Add pass to fold empty branches (PR #239417)

Andy Kaylor via cfe-commits cfe-commits at lists.llvm.org
Thu Nov 5 15:48:44 PST 2026


https://github.com/andykaylor updated https://github.com/llvm/llvm-project/pull/239417

>From 0b6f7949cc7bd08e37da0139d148afd5df1a05c5 Mon Sep 17 00:00:00 2001
From: Andy Kaylor <akaylor at nvidia.com>
Date: Thu, 5 Nov 2026 12:33:54 -0800
Subject: [PATCH 1/2] [CIR] Add pass to fold empty branches

This adds a CIR pass to fold empty branches just before lowering to the
LLVM dialect. The CFG flattening pass, in particular, creates a lot of
empty branches. This cleans that up. Running the CIR canonicalize pass
would have the same effect, but it also eliminates unused values, which
seemed too aggressive.

Assisted-by: Cursor / claude-opus-5.5
---
 clang/include/clang/CIR/Dialect/Passes.h      |   1 +
 clang/include/clang/CIR/Dialect/Passes.td     |  16 ++
 .../Transforms/CIRFoldEmptyBranches.cpp       |  89 +++++++++
 .../lib/CIR/Dialect/Transforms/CMakeLists.txt |   1 +
 clang/lib/CIR/Lowering/CIRPasses.cpp          |   1 +
 clang/test/CIR/CodeGen/abstract-cond.c        |   2 -
 clang/test/CIR/CodeGen/basic.c                |   4 +-
 clang/test/CIR/CodeGen/binassign.c            |   1 -
 .../test/CIR/CodeGen/cleanup-automatic-eh.cpp |   2 -
 .../cleanup-conditional-with-wrapper-eh.cpp   |  10 +-
 .../test/CIR/CodeGen/cleanup-conditional.cpp  |   5 -
 .../CIR/CodeGen/cleanup-scope-goto-out.cpp    |  16 +-
 .../CIR/CodeGen/cleanup-scope-goto-within.cpp |  10 +-
 clang/test/CIR/CodeGen/delete.cpp             |  10 -
 clang/test/CIR/CodeGen/dtors.cpp              |   8 -
 clang/test/CIR/CodeGen/ehspec-noexcept.cpp    |  20 +-
 clang/test/CIR/CodeGen/ehspec.cpp             |   6 +-
 clang/test/CIR/CodeGen/goto.cpp               |  30 +--
 clang/test/CIR/CodeGen/if.cpp                 |  16 +-
 clang/test/CIR/CodeGen/instantiate-init.cpp   |   4 -
 clang/test/CIR/CodeGen/label.c                |  14 +-
 .../CIR/CodeGen/loop-cond-var-cleanup.cpp     |  29 +--
 clang/test/CIR/CodeGen/loop.cpp               |  40 +---
 clang/test/CIR/CodeGen/paren-init-list-eh.cpp |   5 +-
 .../CIR/CodeGen/partial-array-cleanup.cpp     |   9 +-
 clang/test/CIR/CodeGen/statement-exprs.c      |   2 -
 clang/test/CIR/CodeGen/switch-cleanup.cpp     |   5 +-
 .../CIR/CodeGen/switch-pre-case-stmts.cpp     |  20 +-
 clang/test/CIR/CodeGen/switch.cpp             |  84 ---------
 clang/test/CIR/CodeGen/ternary-throw.cpp      |  24 +--
 clang/test/CIR/CodeGen/ternary.cpp            |   4 +-
 clang/test/CIR/CodeGen/three-way-cmp.cpp      |   3 -
 clang/test/CIR/CodeGen/throws.cpp             |   4 +-
 clang/test/CIR/CodeGen/try-catch.cpp          | 174 ++++--------------
 .../test/CIR/CodeGen/virtual-fn-calls-eh.cpp  |   2 -
 clang/test/CIR/CodeGen/vla.c                  |   6 -
 .../CIR/CodeGenBuiltins/builtin-bcopy.cpp     |   4 +-
 clang/test/CIR/CodeGenOpenMP/omp-llvmir.c     |   3 -
 .../CodeGenSYCL/address-space-deduction.cpp   |   2 -
 clang/test/CIR/Lowering/func-simple.cpp       |   4 -
 clang/test/CIR/Lowering/goto.cir              |   6 +-
 clang/test/CIR/Lowering/switch.cir            |  12 +-
 .../CIR/Transforms/fold-empty-branches.cir    | 168 +++++++++++++++++
 clang/tools/cir-opt/cir-opt.cpp               |   3 +
 44 files changed, 376 insertions(+), 503 deletions(-)
 create mode 100644 clang/lib/CIR/Dialect/Transforms/CIRFoldEmptyBranches.cpp
 create mode 100644 clang/test/CIR/Transforms/fold-empty-branches.cir

diff --git a/clang/include/clang/CIR/Dialect/Passes.h b/clang/include/clang/CIR/Dialect/Passes.h
index 117822486cc3a2..7c09a42bed949f 100644
--- a/clang/include/clang/CIR/Dialect/Passes.h
+++ b/clang/include/clang/CIR/Dialect/Passes.h
@@ -26,6 +26,7 @@ enum class CallConvTarget { None, Test, X86_64, AMDGPU };
 namespace mlir {
 
 std::unique_ptr<Pass> createCIRCanonicalizePass();
+std::unique_ptr<Pass> createCIRFoldEmptyBranchesPass();
 std::unique_ptr<Pass> createCIRFlattenCFGPass();
 std::unique_ptr<Pass> createCIRSimplifyPass();
 std::unique_ptr<Pass> createCIREHABILoweringPass();
diff --git a/clang/include/clang/CIR/Dialect/Passes.td b/clang/include/clang/CIR/Dialect/Passes.td
index a5335ab3606dd6..787a9d8f29b899 100644
--- a/clang/include/clang/CIR/Dialect/Passes.td
+++ b/clang/include/clang/CIR/Dialect/Passes.td
@@ -29,6 +29,22 @@ def CIRCanonicalize : Pass<"cir-canonicalize"> {
   let dependentDialects = ["cir::CIRDialect"];
 }
 
+def CIRFoldEmptyBranches : Pass<"cir-fold-empty-branches"> {
+  let summary = "Removes blocks that contain only an unconditional branch";
+  let description = [{
+    Removes every non-entry block that has no arguments, contains only a
+    `cir.br`, and is the only predecessor of the `cir.br` destination. Each
+    predecessor of such a block branches directly to the `cir.br`
+    destination, passing the operands the `cir.br` passed.
+
+    A `cir.br` with a `loop_id` is never removed, so loop metadata is
+    preserved. No operations other than `cir.br` are erased.
+  }];
+
+  let constructor = "mlir::createCIRFoldEmptyBranchesPass()";
+  let dependentDialects = ["cir::CIRDialect"];
+}
+
 def CIRSimplify : Pass<"cir-simplify"> {
   let summary = "Performs CIR simplification and code optimization";
   let description = [{
diff --git a/clang/lib/CIR/Dialect/Transforms/CIRFoldEmptyBranches.cpp b/clang/lib/CIR/Dialect/Transforms/CIRFoldEmptyBranches.cpp
new file mode 100644
index 00000000000000..4b5136a95d0147
--- /dev/null
+++ b/clang/lib/CIR/Dialect/Transforms/CIRFoldEmptyBranches.cpp
@@ -0,0 +1,89 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements a pass that removes blocks containing only an
+// unconditional branch to a block that has no other predecessor, redirecting
+// their predecessors to the branch target.
+//
+//===----------------------------------------------------------------------===//
+
+#include "PassDetail.h"
+#include "mlir/IR/Block.h"
+#include "mlir/IR/Region.h"
+#include "mlir/Interfaces/ControlFlowInterfaces.h"
+#include "clang/CIR/Dialect/IR/CIRDialect.h"
+#include "clang/CIR/Dialect/Passes.h"
+#include "llvm/ADT/STLExtras.h"
+
+using namespace mlir;
+using namespace cir;
+
+namespace mlir {
+#define GEN_PASS_DEF_CIRFOLDEMPTYBRANCHES
+#include "clang/CIR/Dialect/Passes.h.inc"
+} // namespace mlir
+
+namespace {
+
+struct CIRFoldEmptyBranchesPass
+    : public impl::CIRFoldEmptyBranchesBase<CIRFoldEmptyBranchesPass> {
+  using CIRFoldEmptyBranchesBase::CIRFoldEmptyBranchesBase;
+
+  void runOnOperation() override;
+};
+
+/// Erase `block` if it is a non-entry block with no arguments whose only
+/// operation is a `cir.br` to another block, and `block` is the only
+/// predecessor of that block. A `cir.br` with a loop id is a loop back edge
+/// that carries the loop's metadata, so it is kept. Every predecessor
+/// terminator must implement BranchOpInterface so the `cir.br` operands can be
+/// forwarded.
+static bool foldEmptyBranch(Block &block) {
+  if (block.isEntryBlock() || block.getNumArguments() != 0 ||
+      !llvm::hasSingleElement(block))
+    return false;
+
+  auto br = dyn_cast<cir::BrOp>(block.front());
+  if (!br || br.getDest() == &block || br.getLoopIdAttr())
+    return false;
+
+  Block *dest = br.getDest();
+  if (dest->getSinglePredecessor() != &block)
+    return false;
+
+  for (Block *pred : block.getPredecessors())
+    if (!isa<BranchOpInterface>(pred->getTerminator()))
+      return false;
+
+  SmallVector<Value> operands(br.getDestOperands());
+  for (BlockOperand &use : llvm::make_early_inc_range(block.getUses())) {
+    auto branch = cast<BranchOpInterface>(use.getOwner());
+    unsigned index = use.getOperandNumber();
+    branch.getSuccessorOperands(index).append(operands);
+    branch->setSuccessor(dest, index);
+  }
+  block.erase();
+  return true;
+}
+
+void CIRFoldEmptyBranchesPass::runOnOperation() {
+  getOperation()->walk([](Region *region) {
+    bool changed;
+    do {
+      changed = false;
+      for (Block &block : llvm::make_early_inc_range(*region))
+        changed |= foldEmptyBranch(block);
+    } while (changed);
+  });
+}
+
+} // namespace
+
+std::unique_ptr<Pass> mlir::createCIRFoldEmptyBranchesPass() {
+  return std::make_unique<CIRFoldEmptyBranchesPass>();
+}
diff --git a/clang/lib/CIR/Dialect/Transforms/CMakeLists.txt b/clang/lib/CIR/Dialect/Transforms/CMakeLists.txt
index 5f19c41bd1c37d..c379da7d64794c 100644
--- a/clang/lib/CIR/Dialect/Transforms/CMakeLists.txt
+++ b/clang/lib/CIR/Dialect/Transforms/CMakeLists.txt
@@ -3,6 +3,7 @@ add_subdirectory(TargetLowering)
 add_clang_library(MLIRCIRTransforms
   CallConvLoweringPass.cpp
   CIRCanonicalize.cpp
+  CIRFoldEmptyBranches.cpp
   CIRSimplify.cpp
   CIRTransformUtils.cpp
   CXXABILowering.cpp
diff --git a/clang/lib/CIR/Lowering/CIRPasses.cpp b/clang/lib/CIR/Lowering/CIRPasses.cpp
index 24276411df6f9b..2b1cef44dd6c2d 100644
--- a/clang/lib/CIR/Lowering/CIRPasses.cpp
+++ b/clang/lib/CIR/Lowering/CIRPasses.cpp
@@ -162,6 +162,7 @@ void populateCIRPreLoweringPasses(OpPassManager &pm) {
   pm.addPass(createCIRFlattenCFGPass());
   pm.addPass(createCIREHABILoweringPass());
   pm.addPass(createGotoSolverPass());
+  pm.addPass(createCIRFoldEmptyBranchesPass());
 }
 
 } // namespace mlir
diff --git a/clang/test/CIR/CodeGen/abstract-cond.c b/clang/test/CIR/CodeGen/abstract-cond.c
index 98fa2ac8dc0f4e..d9c41072d35a0b 100644
--- a/clang/test/CIR/CodeGen/abstract-cond.c
+++ b/clang/test/CIR/CodeGen/abstract-cond.c
@@ -84,8 +84,6 @@ int test_stmt_expr(int flag, struct s6 a1, struct s6 a2) {
 // LLVM:    %[[COND:.*]] = icmp ne i32 %[[LOAD_FLAG]], 0
 // LLVM:    br i1 %[[COND]], label %[[TRUE:.*]], label %[[FALSE:.*]]
 // LLVM:  [[TRUE]]:
-// LLVM:    br label %[[STMT_BODY:.*]]
-// LLVM:  [[STMT_BODY]]:
 // LLVM:    call void @llvm.memcpy.p0.p0.i64(ptr align 4 %[[T:.*]], ptr align 4 {{.*}}, i64 4, i1 false)
 // LLVM:    call void @foo()
 // LLVM:    call void @llvm.memcpy.p0.p0.i64(ptr align 4 %[[TMP:.*]], ptr align 4 %[[T]], i64 4, i1 false)
diff --git a/clang/test/CIR/CodeGen/basic.c b/clang/test/CIR/CodeGen/basic.c
index ef246cb867208d..e1c30578523304 100644
--- a/clang/test/CIR/CodeGen/basic.c
+++ b/clang/test/CIR/CodeGen/basic.c
@@ -152,9 +152,7 @@ void f5(void) {
 // LLVM: [[SCOPE]]:
 // LLVM:   br label %[[LOOP:.*]]
 // LLVM: [[LOOP]]:
-// LLVM:   br i1 true, label %[[LOOP_STEP:.*]], label %[[LOOP_EXIT:.*]]
-// LLVM: [[LOOP_STEP]]:
-// LLVM:   br label %[[LOOP_BODY:.*]]
+// LLVM:   br i1 true, label %[[LOOP_BODY:.*]], label %[[LOOP_EXIT:.*]]
 // LLVM: [[LOOP_BODY]]:
 // LLVM:   br label %[[LOOP]]
 // LLVM: [[LOOP_EXIT]]:
diff --git a/clang/test/CIR/CodeGen/binassign.c b/clang/test/CIR/CodeGen/binassign.c
index 13ef5b7db0555e..525980923619e4 100644
--- a/clang/test/CIR/CodeGen/binassign.c
+++ b/clang/test/CIR/CodeGen/binassign.c
@@ -169,7 +169,6 @@ int ignore_result_assign() {
 // LLVM:         %{{.*}} = load i32, ptr %[[RETVAL_PTR]]
 // LLVM:         ret i32
 // LLVM:       [[ELSE]]:
-// LLVM:         br label
 // LLVM:         store i32 0, ptr %[[RETVAL_PTR]]
 // LLVM:         %{{.*}} = load i32, ptr %[[RETVAL_PTR]]
 // LLVM:         ret i32
diff --git a/clang/test/CIR/CodeGen/cleanup-automatic-eh.cpp b/clang/test/CIR/CodeGen/cleanup-automatic-eh.cpp
index 360d4f1253f23d..dd49c915cae6e3 100644
--- a/clang/test/CIR/CodeGen/cleanup-automatic-eh.cpp
+++ b/clang/test/CIR/CodeGen/cleanup-automatic-eh.cpp
@@ -37,8 +37,6 @@ void test_cleanup_with_automatic_storage_duration() {
 // LLVM:     to label %[[CONT:.*]] unwind label %[[LPAD:.*]]
 // LLVM: [[CONT]]:
 // LLVM:   call void @_ZN5StrukD1Ev(
-// LLVM:   br label %[[EXIT_NORMAL_CLEANUP:.*]]
-// LLVM: [[EXIT_NORMAL_CLEANUP]]:
 // LLVM:   br label %[[EXIT:.*]]
 // LLVM: [[LPAD]]:
 // LLVM:   landingpad { ptr, i32 }
diff --git a/clang/test/CIR/CodeGen/cleanup-conditional-with-wrapper-eh.cpp b/clang/test/CIR/CodeGen/cleanup-conditional-with-wrapper-eh.cpp
index 70dd8076a1c7eb..b353ff2370a325 100644
--- a/clang/test/CIR/CodeGen/cleanup-conditional-with-wrapper-eh.cpp
+++ b/clang/test/CIR/CodeGen/cleanup-conditional-with-wrapper-eh.cpp
@@ -101,14 +101,10 @@ Wrapper makeWrapper() {
 // LLVM: [[CONSTRUCT_DONE]]:
 // LLVM:   %[[CLEANUP_FLAG:.*]] = load i8, ptr %[[CLEANUP_COND]]
 // LLVM:   %[[SHOULD_CLEANUP:.*]] = trunc i8 %[[CLEANUP_FLAG]] to i1
-// LLVM:   br i1 %[[SHOULD_CLEANUP]], label %[[NORMAL_CLEANUP:.*]], label %[[CLEANUP_DONE:.*]]
+// LLVM:   br i1 %[[SHOULD_CLEANUP]], label %[[NORMAL_CLEANUP:.*]], label %[[DONE:.*]]
 // LLVM: [[NORMAL_CLEANUP]]:
 // LLVM:   call void @_ZNSt10unique_ptrI4BaseED1Ev(ptr {{.*}} %[[AGG_TMP0]])
-// LLVM:   br label %[[CLEANUP_DONE]]
-// LLVM: [[CLEANUP_DONE]]:
-// LLVM:   br label %[[EXIT_CLEANUP_SCOPE:.*]]
-// LLVM: [[EXIT_CLEANUP_SCOPE]]:
-// LLVM:   br label %[[DONE:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[INVOKE_CLEANUP]]:
 // LLVM:   landingpad { ptr, i32 }
 // LLVM:     cleanup
@@ -253,7 +249,6 @@ void APFixedPoint::add(int x) const {
 // LLVM:   br i1 %[[TF_B]], label %[[CLEANUP_T:.*]], label %[[AFTER_T:.*]]
 // LLVM: [[CLEANUP_T]]:
 // LLVM:   call void @_ZN5APIntD1Ev(ptr {{.*}} %[[AGG_TMP]])
-// LLVM: [[AFTER_T]]:
 // LLVM: [[LPAD]]:
 // LLVM:   landingpad { ptr, i32 }
 // LLVM:     cleanup
@@ -268,6 +263,7 @@ void APFixedPoint::add(int x) const {
 // LLVM:   br i1 %[[TF_EH_B]], label %[[EH_CLEANUP_T:.*]], label %[[EH_AFTER_T:.*]]
 // LLVM: [[EH_CLEANUP_T]]:
 // LLVM:   call void @_ZN5APIntD1Ev(ptr {{.*}} %[[AGG_TMP]])
+// LLVM: [[AFTER_T]]:
 // LLVM: [[EH_AFTER_T]]:
 // LLVM:   call void @_ZN5APIntD1Ev(ptr {{.*}} %[[THISVAL]])
 // LLVM:   resume
diff --git a/clang/test/CIR/CodeGen/cleanup-conditional.cpp b/clang/test/CIR/CodeGen/cleanup-conditional.cpp
index b9df861d17e4f3..65bd49a2fdbb78 100644
--- a/clang/test/CIR/CodeGen/cleanup-conditional.cpp
+++ b/clang/test/CIR/CodeGen/cleanup-conditional.cpp
@@ -74,8 +74,6 @@ void test_ternary_temporary(bool c, int x) {
 // LLVMCIR:         call void @_ZN1SD1Ev(ptr {{.*}} %[[TMP]])
 // LLVMCIR:         br label %[[SKIP_DTOR]]
 // LLVMCIR:       [[SKIP_DTOR]]:
-// LLVMCIR:         br label %[[EXIT:.*]]
-// LLVMCIR:       [[EXIT]]:
 // LLVMCIR:         %[[RESULT:.*]] = load i32, ptr %[[RESULT_TMP]]
 // LLVMCIR:         store i32 %[[RESULT]], ptr %{{.*}}
 
@@ -200,7 +198,6 @@ void test_ternary_both_branches(bool c) {
 // LLVMCIR:         call void @_ZN1AD1Ev({{.*}} %[[TMPA]])
 // LLVMCIR:         br label %[[SKIP_DTOR_A]]
 // LLVMCIR:       [[SKIP_DTOR_A]]:
-// LLVMCIR:         br label %{{.*}}
 
 // OGCG-LABEL: define dso_local void @_Z26test_ternary_both_branchesb(
 // OGCG:       [[ENTRY:.*]]:
@@ -321,8 +318,6 @@ int test_return_ternary(bool c) {
 // LLVMCIR:         call void @_ZN1AD1Ev({{.*}} %[[TMPA]])
 // LLVMCIR:         br label %[[SKIP_DTOR_A]]
 // LLVMCIR:       [[SKIP_DTOR_A]]:
-// LLVMCIR:         br label %[[EXIT:.*]]
-// LLVMCIR:       [[EXIT]]:
 // LLVMCIR:         %[[RET:.*]] = load i32, ptr %[[RETVAL]]
 // LLVMCIR:         ret i32 %[[RET]]
 
diff --git a/clang/test/CIR/CodeGen/cleanup-scope-goto-out.cpp b/clang/test/CIR/CodeGen/cleanup-scope-goto-out.cpp
index 76ac8e4d38c607..bd7053fcccc5f7 100644
--- a/clang/test/CIR/CodeGen/cleanup-scope-goto-out.cpp
+++ b/clang/test/CIR/CodeGen/cleanup-scope-goto-out.cpp
@@ -42,8 +42,6 @@ end:;
 // LLVM:         %[[A_ADDR:.*]] = alloca %struct.StructWithDestructor
 // LLVM:         br i1 %{{.*}}, label %[[IF_THEN:.*]], label %[[IF_END:.*]]
 // LLVM:       [[IF_THEN]]:
-// LLVM:         br label %[[BODY:.*]]
-// LLVM:       [[BODY]]:
 // LLVM:         call void @_Z3useR20StructWithDestructor(ptr {{.*}} %[[A_ADDR]])
 // LLVM:         br label %[[CLEANUP:.*]]
 // LLVM:       [[CLEANUP]]:
@@ -108,8 +106,6 @@ end:;
 // LLVM:         store i32 1, ptr %{{.*}}
 // LLVM:         br label %[[CLEANUP:.*]]
 // LLVM:       [[NORMAL_PATH]]:
-// LLVM:         br label %[[FALL:.*]]
-// LLVM:       [[FALL]]:
 // LLVM:         call void @_Z3useR20StructWithDestructor(ptr {{.*}} %[[A_ADDR]])
 // LLVM:         store i32 0, ptr %{{.*}}
 // LLVM:         br label %[[CLEANUP]]
@@ -194,8 +190,6 @@ void test_goto_inner_to_outer(bool cond) {
 // LLVM:         store i32 1, ptr %{{.*}}
 // LLVM:         br label %[[INNER_CLEANUP:.*]]
 // LLVM:       [[NORMAL_PATH]]:
-// LLVM:         br label %[[USE_INNER:.*]]
-// LLVM:       [[USE_INNER]]:
 // LLVM:         call void @_Z3useR20StructWithDestructor(ptr {{.*}} %[[INNER_ADDR:.*]])
 // LLVM:         store i32 0, ptr %{{.*}}
 // LLVM:         br label %[[INNER_CLEANUP]]
@@ -205,10 +199,10 @@ void test_goto_inner_to_outer(bool cond) {
 // LLVM:           i32 0, label %[[FALL_DEST:.*]]
 // LLVM:           i32 1, label %[[GOTO_DEST:.*]]
 // LLVM:         ]
-// LLVM:       [[FALL_DEST]]:
-// LLVM:         br label %{{.*}}
 // LLVM:       [[GOTO_DEST]]:
 // LLVM:         br label %[[USE_OUTER:.*]]
+// LLVM:       [[FALL_DEST]]:
+// LLVM:         br label %{{.*}}
 // LLVM:       [[USE_OUTER]]:
 // LLVM:         call void @_Z3useR20StructWithDestructor(ptr {{.*}} %[[OUTER_ADDR:.*]])
 // LLVM:         br label %[[OUTER_DTOR_BB:.*]]
@@ -293,19 +287,15 @@ end:;
 // LLVM:         store i32 1, ptr %{{.*}}
 // LLVM:         br label %[[INNER_CLEANUP:.*]]
 // LLVM:       [[NORMAL_PATH]]:
-// LLVM:         br label %[[USE_INNER:.*]]
-// LLVM:       [[USE_INNER]]:
 // LLVM:         call void @_Z3useR20StructWithDestructor(ptr {{.*}} %[[INNER_ADDR]])
 // LLVM:         store i32 0, ptr %{{.*}}
 // LLVM:         br label %[[INNER_CLEANUP]]
 // LLVM:       [[INNER_CLEANUP]]:
 // LLVM:         call void @_ZN20StructWithDestructorD1Ev(ptr {{.*}} %[[INNER_ADDR]])
 // LLVM:         switch i32 %{{.*}}, label %[[INNER_DEFAULT:.*]] [
-// LLVM:           i32 0, label %[[INNER_FALL:.*]]
+// LLVM:           i32 0, label %[[USE_OUTER:.*]]
 // LLVM:           i32 1, label %[[INNER_GOTO:.*]]
 // LLVM:         ]
-// LLVM:       [[INNER_FALL]]:
-// LLVM:         br label %[[USE_OUTER:.*]]
 // LLVM:       [[INNER_GOTO]]:
 // LLVM:         store i32 1, ptr %{{.*}}
 // LLVM:         br label %[[OUTER_CLEANUP:.*]]
diff --git a/clang/test/CIR/CodeGen/cleanup-scope-goto-within.cpp b/clang/test/CIR/CodeGen/cleanup-scope-goto-within.cpp
index 2d6a3223883b92..6a9c384c3786fc 100644
--- a/clang/test/CIR/CodeGen/cleanup-scope-goto-within.cpp
+++ b/clang/test/CIR/CodeGen/cleanup-scope-goto-within.cpp
@@ -49,8 +49,6 @@ void test_goto_within_cleanup(bool cond) {
 // LLVM:       [[GOTO_BB]]:
 // LLVM:         br label %[[LABEL_BB:[0-9]+]]
 // LLVM:       [[FALLTHROUGH]]:
-// LLVM:         br label %[[USE_BB:.*]]
-// LLVM:       [[USE_BB]]:
 // LLVM:         call void @_Z3useR20StructWithDestructor(ptr {{.*}} %[[A_ADDR]])
 // LLVM:         br label %[[LABEL_BB]]
 // LLVM:       [[LABEL_BB]]:
@@ -121,21 +119,17 @@ void test_goto_jump_into_nested_op(bool cond1, bool cond2) {
 // LLVM:       [[GOTO_BB]]:
 // LLVM:         br label %[[SKIP_BB:[0-9]+]]
 // LLVM:       [[FALLTHROUGH]]:
-// LLVM:         br label %[[USE_BB:.*]]
-// LLVM:       [[USE_BB]]:
 // LLVM:         call void @_Z3useR20StructWithDestructor(ptr {{.*}} %[[A_ADDR]])
 // LLVM:         br label %[[COND2_BB:.*]]
 // LLVM:       [[COND2_BB]]:
 // LLVM:         %[[COND2_BYTE:.*]] = load i8, ptr %[[COND2_ADDR]]
 // LLVM:         %[[COND2_BIT:.*]] = trunc i8 %[[COND2_BYTE]] to i1
-// LLVM:         br i1 %[[COND2_BIT]], label %[[GOTO_BB2:.*]], label %[[MERGE:.*]]
+// LLVM:         br i1 %[[COND2_BIT]], label %[[GOTO_BB2:.*]], label %[[CLEANUP:.*]]
 // LLVM:       [[GOTO_BB2]]:
 // LLVM:         br label %[[SKIP_BB]]
 // LLVM:       [[SKIP_BB]]:
 // LLVM:         call void @_Z3useR20StructWithDestructor(ptr {{.*}} %[[A_ADDR]])
-// LLVM:         br label %[[MERGE]]
-// LLVM:       [[MERGE]]:
-// LLVM:         br label %[[CLEANUP:.*]]
+// LLVM:         br label %[[CLEANUP]]
 // LLVM:       [[CLEANUP]]:
 // LLVM:         call void @_ZN20StructWithDestructorD1Ev(ptr {{.*}} %[[A_ADDR]])
 // LLVM-NOT:     call void @_ZN20StructWithDestructorD1Ev
diff --git a/clang/test/CIR/CodeGen/delete.cpp b/clang/test/CIR/CodeGen/delete.cpp
index b78a869d66bc74..f4c9e2833591c2 100644
--- a/clang/test/CIR/CodeGen/delete.cpp
+++ b/clang/test/CIR/CodeGen/delete.cpp
@@ -35,13 +35,7 @@ void test_sized_delete(SizedDelete *x) {
 // LLVM:   %[[NOT_NULL:.*]] = icmp ne ptr %[[X]], null
 // LLVM:   br i1 %[[NOT_NULL]], label %[[DELETE_NOTNULL:.*]], label %[[DELETE_END:.*]]
 // LLVM: [[DELETE_NOTNULL]]:
-// LLVM:   br label %[[ENTER_CLEANUP_SCOPE:.*]]
-// LLVM: [[ENTER_CLEANUP_SCOPE]]:
-// LLVM:   br label %[[NORMAL_CLEANUP:.*]]
-// LLVM: [[NORMAL_CLEANUP]]:
 // LLVM:   call void @_ZN11SizedDeletedlEPvm(ptr noundef %[[X]], i64 noundef 4)
-// LLVM:   br label %[[EXIT_CLEANUP:.*]]
-// LLVM: [[EXIT_CLEANUP]]:
 // LLVM:   br label %[[EXIT_CLEANUP_SCOPE:.*]]
 // LLVM: [[EXIT_CLEANUP_SCOPE]]:
 // LLVM:   br label %[[DELETE_END]]
@@ -95,14 +89,10 @@ Container::~Container() { delete contents; }
 // LLVM:   %[[NOT_NULL:.*]] = icmp ne ptr %[[CONTENTS_PTR]], null
 // LLVM:   br i1 %[[NOT_NULL]], label %[[DELETE_NOTNULL:.*]], label %[[DELETE_END:.*]]
 // LLVM: [[DELETE_NOTNULL]]:
-// LLVM:   br label %[[ENTER_CLEANUP_SCOPE:.*]]
-// LLVM: [[ENTER_CLEANUP_SCOPE]]:
 // LLVM:   call void @_ZN8ContentsD2Ev(ptr noundef nonnull align 1 dereferenceable(1) %[[CONTENTS_PTR]])
 // LLVM:   br label %[[NORMAL_CLEANUP:.*]]
 // LLVM: [[NORMAL_CLEANUP]]:
 // LLVM:   call void @_ZdlPvm(ptr noundef %[[CONTENTS_PTR]], i64 noundef 1)
-// LLVM:   br label %[[EXIT_CLEANUP:.*]]
-// LLVM: [[EXIT_CLEANUP]]:
 // LLVM:   br label %[[EXIT_CLEANUP_SCOPE:.*]]
 // LLVM: [[EXIT_CLEANUP_SCOPE]]:
 // LLVM:   br label %[[DELETE_END]]
diff --git a/clang/test/CIR/CodeGen/dtors.cpp b/clang/test/CIR/CodeGen/dtors.cpp
index 7402be349cbd36..d34dd5a56764a3 100644
--- a/clang/test/CIR/CodeGen/dtors.cpp
+++ b/clang/test/CIR/CodeGen/dtors.cpp
@@ -379,15 +379,9 @@ int test_temp_in_condition(G &obj) {
 // LLVM:   br label %[[CLEAN_SCOPE_TWO_CLEANUP:.*]]
 // LLVM: [[CLEAN_SCOPE_TWO_CLEANUP]]:
 // LLVM:   call void @_ZN1GD1Ev(ptr {{.*}} %[[REF_TMP1]])
-// LLVM:   br label %[[EXIT_CLEAN_SCOPE_TWO:.*]]
-// LLVM: [[EXIT_CLEAN_SCOPE_TWO]]:
-// LLVM:   br label %[[CLEAN_SCOPE_ONE_CONTINUE:.*]]
-// LLVM: [[CLEAN_SCOPE_ONE_CONTINUE]]:
 // LLVM:   br label %[[CLEAN_SCOPE_ONE_CLEANUP:.*]]
 // LLVM: [[CLEAN_SCOPE_ONE_CLEANUP]]:
 // LLVM:   call void @_ZN1GD1Ev(ptr {{.*}} %[[REF_TMP0]])
-// LLVM:   br label %[[EXIT_CLEAN_SCOPE_ONE:.*]]
-// LLVM: [[EXIT_CLEAN_SCOPE_ONE]]:
 // LLVM:   br label %[[SCOPE_CONTINUE:.*]]
 // LLVM: [[SCOPE_CONTINUE]]:
 // LLVM:   %[[LOAD_RESULT:.*]] = load i8, ptr %[[TMP_RESULT]]
@@ -398,8 +392,6 @@ int test_temp_in_condition(G &obj) {
 // LLVM:   %[[RETVAL:.*]] = load i32, ptr %[[RET_ADDR]]
 // LLVM:   ret i32 %[[RETVAL]]
 // LLVM: [[FALSE_BLOCK]]:
-// LLVM:   br label %[[EXIT_SCOPE:.*]]
-// LLVM: [[EXIT_SCOPE]]:
 // LLVM:   store i32 0, ptr %[[RET_ADDR]]
 // LLVM:   %[[RETVAL:.*]] = load i32, ptr %[[RET_ADDR]]
 // LLVM:   ret i32 %[[RETVAL]]
diff --git a/clang/test/CIR/CodeGen/ehspec-noexcept.cpp b/clang/test/CIR/CodeGen/ehspec-noexcept.cpp
index 8bbd67d2dbd50f..ea9b2e5da85510 100644
--- a/clang/test/CIR/CodeGen/ehspec-noexcept.cpp
+++ b/clang/test/CIR/CodeGen/ehspec-noexcept.cpp
@@ -160,32 +160,22 @@ void outer() noexcept {
 // LLVM:         br label %[[TRY_CONT]]
 
 // The pipelines lay the join and the terminate handler out in opposite orders,
-// and the CIR pipeline reaches each of them through a chain of empty
-// forwarding blocks, so these checks follow the branches. Interleaving the two
-// chains is what the layout requires, not what the control flow does.
+// and the CIR pipeline reaches the terminate handler through a chain of
+// forwarding blocks, so these checks follow the branches.
 
 // An exception of any other type is on its way to the terminate handler.
 // LLVMCIR:    {{^}}[[NOMATCH]]:
 // LLVMCIR:      br label %[[TERM_CHAIN:[^ ,]+]]
-
-// The join leads to the return.
-// LLVMCIR:    {{^}}[[TRY_CONT]]:
-// LLVMCIR-NEXT: br label %[[RET_CHAIN:[^ ,]+]]
-// LLVMCIR:    {{^}}[[RET_CHAIN]]:
-// LLVMCIR-NEXT: br label %[[RET:[^ ,]+]]
-
-// And the block the unmatched exception branched to terminates.
 // LLVMCIR:    {{^}}[[TERM_CHAIN]]:
 // LLVMCIR:      br label %[[TERM:[^ ,]+]]
 // LLVMCIR:    {{^}}[[TERM]]:
 // LLVMCIR:      call void @__clang_call_terminate(ptr %{{.*}})
 // LLVMCIR-NEXT: unreachable
 
-// LLVMCIR:    {{^}}[[RET]]:
-// LLVMCIR-NEXT: ret void
+// The join returns.
+// LLVM:    {{^}}[[TRY_CONT]]:
+// LLVM-NEXT: ret void
 
-// OGCG:       {{^}}[[TRY_CONT]]:
-// OGCG-NEXT:    ret void
 // OGCG:       {{^}}[[NOMATCH]]:
 // OGCG:         call void @__clang_call_terminate(ptr %{{.*}})
 // OGCG-NEXT:    unreachable
diff --git a/clang/test/CIR/CodeGen/ehspec.cpp b/clang/test/CIR/CodeGen/ehspec.cpp
index 2027f7a2d42366..da9b58c18d8f25 100644
--- a/clang/test/CIR/CodeGen/ehspec.cpp
+++ b/clang/test/CIR/CodeGen/ehspec.cpp
@@ -165,13 +165,11 @@ void outer() throw() {
 // specification's own dispatch block before reaching the unexpected handler.
 // LLVMCIR:    {{^}}[[NOMATCH]]:
 // LLVMCIR:      br label %[[FILTER_DISPATCH:[0-9]+]]
-// LLVMCIR:    {{^}}[[TRY_CONT]]:
 // LLVMCIR:    {{^}}[[FILTER_DISPATCH]]:
 // LLVMCIR:      br label %[[UNEXPECTED:[0-9]+]]
 // LLVMCIR:    {{^}}[[UNEXPECTED]]:
 // LLVMCIR:      call void @__cxa_call_unexpected(ptr %{{.*}})
 // LLVMCIR-NEXT: unreachable
-// LLVMCIR:      ret void
 
-// OGCG:       {{^}}[[TRY_CONT]]:
-// OGCG-NEXT:    ret void
+// LLVM:       {{^}}[[TRY_CONT]]:
+// LLVM-NEXT:    ret void
diff --git a/clang/test/CIR/CodeGen/goto.cpp b/clang/test/CIR/CodeGen/goto.cpp
index a4d1fc35e9f187..911c068dcf8d93 100644
--- a/clang/test/CIR/CodeGen/goto.cpp
+++ b/clang/test/CIR/CodeGen/goto.cpp
@@ -30,9 +30,7 @@ int shouldNotGenBranchRet(int x) {
 // LLVM: define dso_local noundef i32 @_Z21shouldNotGenBranchReti
 // LLVM:   [[COND:%.*]] = load i32, ptr {{.*}}, align 4
 // LLVM:   [[CMP:%.*]] = icmp sgt i32 [[COND]], 5
-// LLVM:   br i1 [[CMP]], label %[[IFTHEN:.*]], label %[[IFEND:.*]]
-// LLVM: [[IFTHEN]]:
-// LLVM:   br label %[[ERR:.*]]
+// LLVM:   br i1 [[CMP]], label %[[ERR:.*]], label %[[IFEND:.*]]
 // LLVM: [[IFEND]]:
 // LLVM:   store i32 0, ptr %[[RETVAL:.*]], align 4
 // LLVM:   [[RET:%.*]] = load i32, ptr %[[RETVAL]], align 4
@@ -71,8 +69,6 @@ int shouldGenBranch(int x) {
 // LLVM: [[IFTHEN]]:
 // LLVM:   br label %[[ERR:.*]]
 // LLVM: [[IFEND]]:
-// LLVM:   br label %[[BB9:.*]]
-// LLVM: [[BB9]]:
 // LLVM:   br label %[[ERR]]
 // LLVM: [[ERR]]:
 // LLVM:   ret i32 [[RET:%.*]]
@@ -221,14 +217,10 @@ extern "C" void case_follow_label(int v) {
 // LLVM:   br label %[[CASE2]]
 // LLVM: [[CASE2]]:
 // LLVM:   call void @action1()
-// LLVM:   br label %[[BREAK:.*]]
-// LLVM: [[BREAK]]:
-// LLVM:   br label %[[END:.*]]
+// LLVM:   br label %[[RET:.*]]
 // LLVM: [[SWDEFAULT]]:
 // LLVM:   call void @action2()
 // LLVM:   br label %[[LABEL]]
-// LLVM: [[END]]:
-// LLVM:   br label %[[RET:.*]]
 // LLVM: [[RET]]:
 // LLVM:   ret void
 
@@ -272,22 +264,20 @@ extern "C" void default_follow_label(int v) {
 // CIR:   cir.goto "label"
 
 // LLVM: define dso_local void @default_follow_label
-// LLVM: [[CASE1:.*]]:
-// LLVM:   br label %[[BB8:.*]]
-// LLVM: [[BB8]]:
-// LLVM:   br label %[[CASE2:.*]]
+// LLVM:  switch i32 {{.*}}, label %[[SWDEFAULT:.*]] [
+// LLVM:    i32 1, label %[[CASE1:.*]]
+// LLVM:    i32 2, label %[[CASE2:.*]]
+// LLVM:  ]
+// LLVM: [[CASE1]]:
+// LLVM:   br label %[[CASE2]]
 // LLVM: [[CASE2]]:
 // LLVM:   call void @action1()
-// LLVM:   br label %[[BREAK:.*]]
+// LLVM:   br label %[[RET:.*]]
 // LLVM: [[LABEL:.*]]:
-// LLVM:   br label %[[SWDEFAULT:.*]]
+// LLVM:   br label %[[SWDEFAULT]]
 // LLVM: [[SWDEFAULT]]:
 // LLVM:   call void @action2()
-// LLVM:   br label %[[BB9:.*]]
-// LLVM: [[BB9]]:
 // LLVM:   br label %[[LABEL]]
-// LLVM: [[BREAK]]:
-// LLVM:   br label %[[RET:.*]]
 // LLVM: [[RET]]:
 // LLVM:   ret void
 
diff --git a/clang/test/CIR/CodeGen/if.cpp b/clang/test/CIR/CodeGen/if.cpp
index 12c35a175650be..143ddcc33d2fce 100644
--- a/clang/test/CIR/CodeGen/if.cpp
+++ b/clang/test/CIR/CodeGen/if.cpp
@@ -37,11 +37,9 @@ int if0(bool a) {
 // LLVM:   %9 = load i32, ptr %2, align 4
 // LLVM:   ret i32 %9
 // LLVM: [[END]]:
-// LLVM:   br label %[[LABEL4:.*]]
-// LLVM: [[LABEL4]]:
 // LLVM:   store i32 3, ptr %2, align 4
-// LLVM:   %12 = load i32, ptr %2, align 4
-// LLVM:   ret i32 %12
+// LLVM:   %11 = load i32, ptr %2, align 4
+// LLVM:   ret i32 %11
 
 // OGCG: define{{.*}} i32 @_Z3if0b(i1 noundef zeroext %a)
 // OGCG: entry:
@@ -101,8 +99,6 @@ void if1(int a) {
 // LLVM:   store i32 4, ptr %[[X]], align 4
 // LLVM:   br label %[[END]]
 // LLVM: [[END]]:
-// LLVM:   br label %[[EXIT:.*]]
-// LLVM: [[EXIT]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z3if1i(i32 noundef %[[A:.*]])
@@ -192,12 +188,8 @@ void if2(int a, bool b, bool c) {
 // LLVM:   store i32 8, ptr %[[VARX]], align 4
 // LLVM:   br label %[[IF_END2]]
 // LLVM: [[IF_END2]]:
-// LLVM:   br label %[[LABEL19:.*]]
-// LLVM: [[LABEL19]]:
 // LLVM:   br label %[[LABEL27:.*]]
 // LLVM: [[IF_ELSE]]:
-// LLVM:   br label %[[LABEL21:.*]]
-// LLVM: [[LABEL21]]:
 // LLVM:   %[[LOAD_C:.*]] = load i8, ptr %[[VARC]], align 1
 // LLVM:   %[[TRUNC_C:.*]] = trunc i8 %[[LOAD_C]] to i1
 // LLVM:   br i1 %[[TRUNC_C]], label %[[IF_THEN3:.*]], label %[[IF_END3:.*]]
@@ -205,13 +197,9 @@ void if2(int a, bool b, bool c) {
 // LLVM:   store i32 14, ptr %[[VARX]], align 4
 // LLVM:   br label %[[IF_END3]]
 // LLVM: [[IF_END3]]:
-// LLVM:   br label %[[LABEL26:.*]]
-// LLVM: [[LABEL26]]:
 // LLVM:   store i32 4, ptr %[[VARX]], align 4
 // LLVM:   br label %[[LABEL27]]
 // LLVM: [[LABEL27]]:
-// LLVM:   br label %[[LABEL28:.*]]
-// LLVM: [[LABEL28]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z3if2ibb(i32 noundef %[[A:.*]], i1 noundef zeroext %[[B:.*]], i1 noundef zeroext %[[C:.*]])
diff --git a/clang/test/CIR/CodeGen/instantiate-init.cpp b/clang/test/CIR/CodeGen/instantiate-init.cpp
index 42b82392925a26..a1f3647b2ae34e 100644
--- a/clang/test/CIR/CodeGen/instantiate-init.cpp
+++ b/clang/test/CIR/CodeGen/instantiate-init.cpp
@@ -75,13 +75,9 @@ void init_vec_using_initalizer_list() {
 // LLVM:   %[[SIZE_SLOT:.*]] = getelementptr inbounds nuw { ptr, i64 }, ptr %[[AGG_ADDR]], i32 0, i32 1
 // LLVM:   %[[SIZE_ARG:.*]] = load i64, ptr %[[SIZE_SLOT]], align 8
 // LLVM:   call void @_ZN6VectorC1ESt16initializer_listIiE(ptr noundef nonnull align 1 dereferenceable(1) %[[VEC_ADDR]], ptr %[[DATA_ARG]], i64 %[[SIZE_ARG]])
-// LLVM:   br label %[[SCOPE_CONT:.*]]
-// LLVM: [[SCOPE_CONT]]:
 // LLVM:   br label %[[CLEANUP_START:.*]]
 // LLVM: [[CLEANUP_START]]:
 // LLVM:   call void @_ZN6VectorD1Ev(ptr noundef nonnull align 1 dereferenceable(1) %[[VEC_ADDR]])
-// LLVM:   br label %[[CLEANUP_CONT:.*]]
-// LLVM: [[CLEANUP_CONT]]:
 // LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
diff --git a/clang/test/CIR/CodeGen/label.c b/clang/test/CIR/CodeGen/label.c
index 49e7c3e60c165d..b281697f77e0e0 100644
--- a/clang/test/CIR/CodeGen/label.c
+++ b/clang/test/CIR/CodeGen/label.c
@@ -44,8 +44,6 @@ void multiple_labels() {
 // LLVM: define dso_local void @multiple_labels(){{.*}}
 // LLVM:   br label %1
 // LLVM: 1:
-// LLVM:   br label %2
-// LLVM: 2:
 // LLVM:   ret void
 
 // OGCG: define dso_local void @multiple_labels
@@ -78,17 +76,13 @@ void label_in_if(int cond) {
 // LLVM: 3:
 // LLVM:   [[LOAD:%.*]] = load i32, ptr [[COND:%.*]], align 4
 // LLVM:   [[CMP:%.*]] = icmp ne i32 [[LOAD]], 0
-// LLVM:   br i1 [[CMP]], label %6, label %10
+// LLVM:   br i1 [[CMP]], label %6, label %9
 // LLVM: 6:
-// LLVM:   br label %7
-// LLVM: 7:
 // LLVM:   [[LOAD2:%.*]] = load i32, ptr [[COND]], align 4
 // LLVM:   [[ADD1:%.*]] = add nsw i32 [[LOAD2]], 1
 // LLVM:   store i32 [[ADD1]], ptr [[COND]], align 4
-// LLVM:   br label %10
-// LLVM: 10:
-// LLVM:   br label %11
-// LLVM: 11:
+// LLVM:   br label %9
+// LLVM: 9:
 // LLVM:  ret void
 
 // OGCG: define dso_local void @label_in_if
@@ -188,8 +182,6 @@ void foo() {
 // LLVM:  %{{.*}} = alloca %struct.S, align 1
 // LLVM:  br label %2
 // LLVM:2:
-// LLVM:  br label %3
-// LLVM:3:
 // LLVM:  call void @get()
 // LLVM:  call void @bar()
 
diff --git a/clang/test/CIR/CodeGen/loop-cond-var-cleanup.cpp b/clang/test/CIR/CodeGen/loop-cond-var-cleanup.cpp
index f95602536a6d1a..2c2849c0661d56 100644
--- a/clang/test/CIR/CodeGen/loop-cond-var-cleanup.cpp
+++ b/clang/test/CIR/CodeGen/loop-cond-var-cleanup.cpp
@@ -80,10 +80,8 @@ void while_cond_var(int n) {
 // LLVM:         call void @_ZN1SD1Ev(ptr {{.*}} %[[S]])
 // LLVM:         %[[SEL:.*]] = load i32, ptr %[[DEST]]
 // LLVM:         switch i32 %[[SEL]], label %{{.*}}
-// LLVM:           i32 0, label %[[CONTINUE:.*]]
+// LLVM:           i32 0, label %[[BACKEDGE:.*]]
 // LLVM:           i32 1, label %[[BREAK:.*]]
-// LLVM:       [[CONTINUE]]:
-// LLVM:         br label %[[BACKEDGE:.*]]
 // LLVM:       [[BREAK]]:
 // LLVM:         br label %[[EXIT]]
 // LLVM:       [[LPAD]]:
@@ -502,10 +500,8 @@ void for_cond_var_continue() {
 // LLVM:         call void @_ZN1SD1Ev(ptr {{.*}} %[[S]])
 // LLVM:         %[[SEL:.*]] = load i32, ptr %[[DEST]], align 4
 // LLVM:         switch i32 %[[SEL]], label %{{.*}}
-// LLVM:           i32 0, label %[[CONTINUE:.*]]
+// LLVM:           i32 0, label %[[BACKEDGE1:.*]]
 // LLVM:           i32 1, label %[[BREAK:.*]]
-// LLVM:       [[CONTINUE]]:
-// LLVM:         br label %[[BACKEDGE0:.*]]
 // LLVM:       [[BREAK]]:
 // LLVM:         br label %[[EXIT]]
 // LLVM:       [[LPAD]]:
@@ -517,8 +513,6 @@ void for_cond_var_continue() {
 // LLVM:       [[EHDTOR]]:
 // LLVM:         call void @_ZN1SD1Ev(ptr {{.*}} %[[S]])
 // LLVM:         resume { ptr, i32 }
-// LLVM:       [[BACKEDGE0]]:
-// LLVM:         br label %[[BACKEDGE1:.*]]
 // LLVM:       [[BACKEDGE1]]:
 // LLVM:         br label %[[COND]]
 
@@ -616,10 +610,8 @@ void for_cond_var(int n) {
 // LLVM:         call void @_ZN1SD1Ev(ptr {{.*}} %[[S]])
 // LLVM:         %[[SEL:.*]] = load i32, ptr %[[DEST]], align 4
 // LLVM:         switch i32 %[[SEL]], label %{{.*}}
-// LLVM:           i32 0, label %[[CONTINUE:.*]]
+// LLVM:           i32 0, label %[[BACKEDGE1:.*]]
 // LLVM:           i32 1, label %[[BREAK:.*]]
-// LLVM:       [[CONTINUE]]:
-// LLVM:         br label %[[BACKEDGE0:.*]]
 // LLVM:       [[BREAK]]:
 // LLVM:         br label %[[EXIT]]
 // LLVM:       [[LPAD]]:
@@ -631,8 +623,6 @@ void for_cond_var(int n) {
 // LLVM:       [[EHDTOR]]:
 // LLVM:         call void @_ZN1SD1Ev(ptr {{.*}} %[[S]])
 // LLVM:         resume { ptr, i32 }
-// LLVM:       [[BACKEDGE0]]:
-// LLVM:         br label %[[BACKEDGE1:.*]]
 // LLVM:       [[BACKEDGE1]]:
 // LLVM:         br label %[[COND]]
 
@@ -749,10 +739,8 @@ void while_cond_var_temp(int n) {
 // LLVM:         call void @_ZN1SD1Ev(ptr {{.*}} %[[S]])
 // LLVM:         %[[SEL:.*]] = load i32, ptr %[[DEST]], align 4
 // LLVM:         switch i32 %[[SEL]], label %{{.*}}
-// LLVM:           i32 0, label %[[CONTINUE:.*]]
+// LLVM:           i32 0, label %[[BACKEDGE:.*]]
 // LLVM:           i32 1, label %[[BREAK:.*]]
-// LLVM:       [[CONTINUE]]:
-// LLVM:         br label %[[BACKEDGE:.*]]
 // LLVM:       [[BREAK]]:
 // LLVM:         br label %[[EXIT]]
 // LLVM:       [[LPAD_OUTER]]:
@@ -875,7 +863,6 @@ void while_cond_var_nested(int n) {
 // LLVM:         br i1 true, label %{{.*}}, label %[[OUTER_EXIT:.*]]
 // LLVM:         store i8 0, ptr %[[FLAG_OUTER]], align 1
 // LLVM:         br label %{{.*}}
-// LLVM:         br label %{{.*}}
 // LLVM:         br label %[[INNER_COND:.*]]
 // LLVM:       [[INNER_COND]]:
 // LLVM:         br i1 true, label %{{.*}}, label %[[INNER_EXIT:.*]]
@@ -906,10 +893,8 @@ void while_cond_var_nested(int n) {
 // LLVM:         call void @_ZN1SD1Ev(ptr {{.*}} %[[T]])
 // LLVM:         %[[ISEL:.*]] = load i32, ptr %[[DEST]], align 4
 // LLVM:         switch i32 %[[ISEL]], label %{{.*}}
-// LLVM:           i32 0, label %[[ICONTINUE:.*]]
+// LLVM:           i32 0, label %[[IBACKEDGE:.*]]
 // LLVM:           i32 1, label %[[IBREAK:.*]]
-// LLVM:       [[ICONTINUE]]:
-// LLVM:         br label %[[IBACKEDGE:.*]]
 // LLVM:       [[IBREAK]]:
 // LLVM:         br label %[[INNER_EXIT]]
 // LLVM:       [[INNER_LPAD]]:
@@ -947,10 +932,8 @@ void while_cond_var_nested(int n) {
 // LLVM:         call void @_ZN1SD1Ev(ptr {{.*}} %[[S]])
 // LLVM:         %[[OSEL:.*]] = load i32, ptr %[[DEST]], align 4
 // LLVM:         switch i32 %[[OSEL]], label %{{.*}}
-// LLVM:           i32 0, label %[[OCONTINUE:.*]]
+// LLVM:           i32 0, label %[[OBACKEDGE:.*]]
 // LLVM:           i32 1, label %[[OBREAK:.*]]
-// LLVM:       [[OCONTINUE]]:
-// LLVM:         br label %[[OBACKEDGE:.*]]
 // LLVM:       [[OBREAK]]:
 // LLVM:         br label %[[OUTER_EXIT]]
 // LLVM:       [[OUTER_LPAD]]:
diff --git a/clang/test/CIR/CodeGen/loop.cpp b/clang/test/CIR/CodeGen/loop.cpp
index 15525220be67f8..ead9444c9cd461 100644
--- a/clang/test/CIR/CodeGen/loop.cpp
+++ b/clang/test/CIR/CodeGen/loop.cpp
@@ -34,12 +34,8 @@ void l0() {
 // LLVM: [[LABEL2]]:
 // LLVM:   br i1 true, label %[[LABEL3:.*]], label %[[LABEL5:.*]]
 // LLVM: [[LABEL3]]:
-// LLVM:   br label %[[LABEL4:.*]]
-// LLVM: [[LABEL4]]:
 // LLVM:   br label %[[LABEL2]]
 // LLVM: [[LABEL5]]:
-// LLVM:   br label %[[LABEL6:.*]]
-// LLVM: [[LABEL6]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z2l0v()
@@ -79,12 +75,8 @@ void l1() {
 // LLVM: [[LABEL2]]:
 // LLVM:   br i1 true, label %[[LABEL3:.*]], label %[[LABEL5:.*]]
 // LLVM: [[LABEL3]]:
-// LLVM:   br label %[[LABEL4:.*]]
-// LLVM: [[LABEL4]]:
 // LLVM:   br label %[[LABEL2]]
 // LLVM: [[LABEL5]]:
-// LLVM:   br label %[[LABEL6:.*]]
-// LLVM: [[LABEL6]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z2l1v()
@@ -133,8 +125,6 @@ void l2() {
 // LLVM: [[LABEL4]]:
 // LLVM:   br label %[[LABEL2]]
 // LLVM: [[LABEL5]]:
-// LLVM:   br label %[[LABEL6:.*]]
-// LLVM: [[LABEL6]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z2l2v()
@@ -181,8 +171,6 @@ void l3() {
 // LLVM: [[LABEL4]]:
 // LLVM:   br label %[[LABEL2]]
 // LLVM: [[LABEL5]]:
-// LLVM:   br label %[[LABEL6:.*]]
-// LLVM: [[LABEL6]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z2l3v()
@@ -267,8 +255,6 @@ void l4() {
 // LLVM:   store ptr %[[NEXT]], ptr %[[BEGIN_ADDR]]
 // LLVM:   br label %[[COND]]
 // LLVM: [[END]]:
-// LLVM:   br label %[[EXIT:.*]]
-// LLVM: [[EXIT]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z2l4v()
@@ -379,8 +365,6 @@ void l5() {
 // LLVM:   store ptr %[[NEXT]], ptr %[[BEGIN_ADDR]]
 // LLVM:   br label %[[COND]]
 // LLVM: [[END]]:
-// LLVM:   br label %[[EXIT:.*]]
-// LLVM: [[EXIT]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z2l5v()
@@ -434,14 +418,10 @@ void test_do_while_false() {
 // LLVM: define{{.*}} void @_Z19test_do_while_falsev(){{.*}}
 // LLVM:   br label %[[LABEL1:.*]]
 // LLVM: [[LABEL1]]:
-// LLVM:   br label %[[LABEL3:.*]]
-// LLVM: [[LABEL2:.*]]:
-// LLVM:   br i1 false, label %[[LABEL3]], label %[[LABEL4:.*]]
-// LLVM: [[LABEL3]]:
-// LLVM:   br label %[[LABEL2]]
+// LLVM:   br label %[[LABEL2:.*]]
+// LLVM: [[LABEL2]]:
+// LLVM:   br i1 false, label %[[LABEL2]], label %[[LABEL4:.*]]
 // LLVM: [[LABEL4]]:
-// LLVM:   br label %[[LABEL5:.*]]
-// LLVM: [[LABEL5]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z19test_do_while_falsev()
@@ -476,15 +456,11 @@ void test_empty_while_true() {
 // LLVM: [[LABEL2]]:
 // LLVM:   br i1 true, label %[[LABEL3:.*]], label %[[LABEL6:.*]]
 // LLVM: [[LABEL3]]:
-// LLVM:   br label %[[LABEL4]]
-// LLVM: [[LABEL4]]:
 // LLVM:   ret void
 // LLVM: [[LABEL5:.*]]:
 // LLVM-SAME: ; No predecessors!
 // LLVM:   br label %[[LABEL2:.*]]
 // LLVM: [[LABEL6]]:
-// LLVM:   br label %[[LABEL7:.*]]
-// LLVM: [[LABEL7]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z21test_empty_while_truev()
@@ -530,8 +506,6 @@ void unreachable_after_continue() {
 // LLVM: [[LABEL2]]:
 // LLVM:   br i1 true, label %[[LABEL3:.*]], label %[[LABEL8:.*]]
 // LLVM: [[LABEL3]]:
-// LLVM:   br label %[[LABEL4:.*]]
-// LLVM: [[LABEL4]]:
 // LLVM:   br label %[[LABEL7:.*]]
 // LLVM: [[LABEL5:.*]]:
 // LLVM-SAME: ; No predecessors!
@@ -542,8 +516,6 @@ void unreachable_after_continue() {
 // LLVM: [[LABEL7]]:
 // LLVM:   br label %[[LABEL2]]
 // LLVM: [[LABEL8]]:
-// LLVM:   br label %[[LABEL9:]]
-// LLVM: [[LABEL9]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z26unreachable_after_continuev()
@@ -590,20 +562,14 @@ void unreachable_after_break() {
 // LLVM: [[LABEL2]]:
 // LLVM:   br i1 true, label %[[LABEL3:.*]], label %[[LABEL8:.*]]
 // LLVM: [[LABEL3]]:
-// LLVM:   br label %[[LABEL4:.*]]
-// LLVM: [[LABEL4]]:
 // LLVM:   br label %[[LABEL8]]
 // LLVM: [[LABEL5:.*]]:
 // LLVM-SAME: ; No predecessors!
 // LLVM:   store i32 1, ptr %[[X]], align 4
 // LLVM:   br label %[[LABEL6:.*]]
 // LLVM: [[LABEL6]]:
-// LLVM:   br label %[[LABEL7:.*]]
-// LLVM: [[LABEL7]]:
 // LLVM:   br label %[[LABEL2]]
 // LLVM: [[LABEL8]]:
-// LLVM:   br label %[[LABEL9:]]
-// LLVM: [[LABEL9]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z23unreachable_after_breakv()
diff --git a/clang/test/CIR/CodeGen/paren-init-list-eh.cpp b/clang/test/CIR/CodeGen/paren-init-list-eh.cpp
index 7b022265511350..8afc54d1873b9d 100644
--- a/clang/test/CIR/CodeGen/paren-init-list-eh.cpp
+++ b/clang/test/CIR/CodeGen/paren-init-list-eh.cpp
@@ -64,8 +64,6 @@ void test_init_list_with_dtor() {
 // LLVM:   %[[X_ADDR:.*]] = getelementptr inbounds nuw %struct.Outer, ptr %[[O]], i32 0, i32 2
 // LLVM:   store i32 3, ptr %[[X_ADDR]]
 // LLVM:   br label %[[EXIT_CLEANUP_SCOPE:.*]]
-// LLVM: [[EXIT_CLEANUP_SCOPE]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LPAD]]:
 // LLVM:   %[[EXN:.*]] = landingpad { ptr, i32 }
 // LLVM:                    cleanup
@@ -79,6 +77,9 @@ void test_init_list_with_dtor() {
 // LLVM:   %[[EXN_INS:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_ADDR_PHI]], 0
 // LLVM:   %[[EXN_INS2:.*]] = insertvalue { ptr, i32 } %[[EXN_INS]], i32 %[[EXN_SELECTOR_PHI]], 1
 // LLVM:   resume { ptr, i32 } %[[EXN_INS2]]
+// LLVM: [[EXIT_CLEANUP_SCOPE]]:
+// LLVM:   call void @_ZN5OuterD1Ev(ptr{{.*}} %[[O]])
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
diff --git a/clang/test/CIR/CodeGen/partial-array-cleanup.cpp b/clang/test/CIR/CodeGen/partial-array-cleanup.cpp
index 2fe74012873e39..100e5580470206 100644
--- a/clang/test/CIR/CodeGen/partial-array-cleanup.cpp
+++ b/clang/test/CIR/CodeGen/partial-array-cleanup.cpp
@@ -290,7 +290,7 @@ void test_variable_size_partial_array_cleanup(int n) {
 // LLVM:     [[CTOR_LOOP_COND:.*]]:
 // LLVM:       %[[COND_CUR:.*]] = load ptr, ptr %[[CTOR_ITER]]
 // LLVM:       %[[CTOR_DONE:.*]] = icmp ne ptr %[[COND_CUR]], %[[END]]
-// LLVM:       br i1 %[[CTOR_DONE]], label %[[CTOR_BODY]], label %[[CTOR_EXIT:.*]]
+// LLVM:       br i1 %[[CTOR_DONE]], label %[[CTOR_BODY]], label %[[CTOR_JOIN:.*]]
 //
 //            --- ctor loop body ---
 // LLVM:     [[CTOR_BODY]]:
@@ -303,9 +303,6 @@ void test_variable_size_partial_array_cleanup(int n) {
 // LLVM:       store ptr %[[NEXT]], ptr %[[CTOR_ITER]]
 // LLVM:       br label %[[CTOR_LOOP_COND]]
 //
-// LLVM:     [[CTOR_EXIT]]:
-// LLVM:       br label %[[CTOR_JOIN:.*]]
-//
 //            --- landing pad + cleanup guard ---
 // LLVM:     [[LPAD]]:
 // LLVM:       landingpad { ptr, i32 }
@@ -1390,7 +1387,7 @@ void test_partial_cleanup_covers_init_only() {
 // LLVM:         invoke void @_ZN1SC1Ev(ptr {{.*}})
 // LLVM:           to label %[[CONT2:.*]] unwind label %[[INIT_LPAD]]
 // LLVM:       [[CONT2]]:
-// LLVM:         br label %[[AFTER_INIT:.*]]
+// LLVM:         br label %[[SIDE:.*]]
 // LLVM-NOT:     @_Z11side_effectv()
 // LLVM:       [[INIT_LPAD]]:
 // LLVM:         landingpad { ptr, i32 }
@@ -1398,8 +1395,6 @@ void test_partial_cleanup_covers_init_only() {
 // LLVM:         icmp ne ptr %{{.*}}, %{{.*}}
 // LLVM:         call void @_ZN3AggD1Ev(ptr {{.*}})
 // LLVM:         resume { ptr, i32 }
-// LLVM:       [[AFTER_INIT]]:
-// LLVM:         br label %[[SIDE:.*]]
 // LLVM:       [[SIDE]]:
 // LLVM:         invoke void @_Z11side_effectv()
 // LLVM:           to label %{{.*}} unwind label %[[FULL_LPAD:.*]]
diff --git a/clang/test/CIR/CodeGen/statement-exprs.c b/clang/test/CIR/CodeGen/statement-exprs.c
index 947291d8136526..d2b860acc1554e 100644
--- a/clang/test/CIR/CodeGen/statement-exprs.c
+++ b/clang/test/CIR/CodeGen/statement-exprs.c
@@ -118,8 +118,6 @@ int nested(void) {
 // LLVM:     br label %[[LBL10:.+]]
 // LLVM: [[LBL10]]:
 // LLVM:     store i32 987, ptr %[[VAR1]]
-// LLVM:     br label %[[LBL11:.+]]
-// LLVM: [[LBL11]]:
 // LLVM:     br label %[[LBL12:.+]]
 // LLVM: [[LBL12]]:
 // LLVM:     store i32 123, ptr %[[VAR5]]
diff --git a/clang/test/CIR/CodeGen/switch-cleanup.cpp b/clang/test/CIR/CodeGen/switch-cleanup.cpp
index 0caed937a31545..8b931971876235 100644
--- a/clang/test/CIR/CodeGen/switch-cleanup.cpp
+++ b/clang/test/CIR/CodeGen/switch-cleanup.cpp
@@ -178,10 +178,7 @@ void cleanup_in_while_in_switch(int x) {
 // LLVM:           i32 0, label %[[CASE_ZERO:.*]]
 // LLVM:         ]
 // LLVM:       [[DEAD_BLOCK:.*]]:
-// LLVMCIR:      br label %[[SWITCH_BODY:.*]]
-// OGCG:         br label %[[WHILE_COND:.*]]
-// LLVMCIR:    [[SWITCH_BODY]]:
-// LLVMCIR:      br label %[[WHILE_COND:.*]]
+// LLVM:         br label %[[WHILE_COND:.*]]
 // LLVM:       [[WHILE_COND]]:
 // LLVM:         icmp
 // LLVM:         br i1 %{{.*}}, label %[[WHILE_BODY:.*]], label %[[WHILE_END:.*]]
diff --git a/clang/test/CIR/CodeGen/switch-pre-case-stmts.cpp b/clang/test/CIR/CodeGen/switch-pre-case-stmts.cpp
index 0a9327417f807d..20e61a50f77762 100644
--- a/clang/test/CIR/CodeGen/switch-pre-case-stmts.cpp
+++ b/clang/test/CIR/CodeGen/switch-pre-case-stmts.cpp
@@ -28,14 +28,12 @@ void pre_case_label() {
 // LLVM:   i32 1, label %[[CASE1:.*]]
 // LLVM: ]
 // LLVM: [[LABEL:.*]]:{{.*}}; No predecessors!
-// LLVM: br label %[[JUMPS_TO_CASE1:.*]]
-// LLVM: [[JUMPS_TO_CASE1]]:
 // LLVM:   br label %[[CASE1]]
 // CIR inserts a bunch of 'empty' blocks all over the place that just jump to
 // the next, so unifying these check blocks/checking more is pretty
 // awful/doesn't result in good checks.
 // LLVM: [[END]]:
-// LLVM:   br label
+// LLVM:   ret void
 
 // OGCG-LABEL: define{{.*}} void @_Z14pre_case_labelv
 // OGCG: switch i32 1, label %[[END:.*]] [
@@ -75,17 +73,11 @@ void multiple_pre_case_labels() {
 // LLVM:     i32 1, label %[[CASE1:.*]]
 // LLVM:   ]
 // LLVM: [[LABEL1:.*]]:
-// LLVM:   br label %[[LABEL2:.*]]
-// LLVM: [[LABEL2]]:
-// LLVM:   br label %[[JUMPS_TO_CASE1:.*]]
-// LLVM: [[JUMPS_TO_CASE1]]:
 // LLVM:   br label %[[CASE1]]
 // LLVM: [[CASE1]]:
-// LLVM:   br label %[[JUMPS_TO_END:.*]]
-// LLVM: [[JUMPS_TO_END]]:
 // LLVM:   br label %[[END]]
 // LLVM: [[END]]:
-// LLVM:   br label
+// LLVM:   ret void
 
 // OGCG-LABEL: define{{.*}} @_Z24multiple_pre_case_labelsv
 // OGCG:   switch i32 1, label %[[END:.*]] [
@@ -160,17 +152,13 @@ void pre_case_if(int cond) {
 // LLVM:  switch i32 1, label %[[END:.*]] [
 // LLVM:    i32 1, label %[[CASE1:.*]]
 // LLVM:  ]
-// LLVM: [[ENTRY:.*]]:{{.*}}; No predecessors!
-// LLVM: br label %[[IF_BLOCK:.*]]
-// LLVM: [[IF_BLOCK]]:
+// LLVM: [[IF_BLOCK:.*]]:{{.*}}; No predecessors!
 // LLVM: load i32
 // LLVM: icmp ne i32
 // LLVM: br i1 %{{.*}}, label %[[TRUE:.*]], label %[[FALSE:.*]]
 // LLVM: [[TRUE]]:
 // LLVM: br label %[[FALSE]]
 // LLVM: [[FALSE]]:
-// LLVM: br label %[[JUMPS_TO_CASE1:.*]]
-// LLVM: [[JUMPS_TO_CASE1:.*]]:
 // LLVM: br label %[[CASE1]]
 // LLVM: [[CASE1]]:
 // LLVM: [[END]]:
@@ -258,8 +246,6 @@ void label_only_switch() {
 // LLVM:   switch i32 1, label %[[END:.*]] [
 // LLVM:   ]
 // LLVM: [[LABEL:.*]]:{{.*}}; No predecessors!
-// LLVM:   br label %[[JUMPS_TO_END:.*]]
-// LLVM: [[JUMPS_TO_END]]:
 // LLVM:   br label %[[END]]
 
 // OGCG-LABEL: define{{.*}} @_Z17label_only_switchv
diff --git a/clang/test/CIR/CodeGen/switch.cpp b/clang/test/CIR/CodeGen/switch.cpp
index 0d3d3d1ae9238d..8b50712b057cc8 100644
--- a/clang/test/CIR/CodeGen/switch.cpp
+++ b/clang/test/CIR/CodeGen/switch.cpp
@@ -48,16 +48,12 @@ void sw1(int a) {
 // LLVM: [[CASE1]]:
 // LLVM:   br label %[[EXIT]]
 // LLVM: [[CASE2]]:
-// LLVM:   br label %[[BB14:.*]]
-// LLVM: [[BB14]]:
 // LLVM:   %[[B2:.*]] = load i32, ptr %[[B_ADDR]], align 4
 // LLVM:   %[[INC2:.*]] = add nsw i32 %[[B2]], 1
 // LLVM:   store i32 %[[INC2]], ptr %[[B_ADDR]], align 4
 // LLVM:   store i32 100, ptr %[[YOLO:.*]], align 4
 // LLVM:   br label %[[EXIT]]
 // LLVM: [[EXIT]]:
-// LLVM:   br label %[[DEFAULT:.*]]
-// LLVM: [[DEFAULT]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z3sw1i
@@ -122,8 +118,6 @@ void sw2(int a) {
 // LLVM:   store i32 %[[YOLO_PLUS_FOMO]], ptr %[[YOLO_ADDR]], align 4
 // LLVM:   br label %[[EXIT]]
 // LLVM: [[EXIT]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z3sw2i
@@ -168,10 +162,6 @@ void sw3(int a) {
 // LLVM:   switch i32 %[[A_VAL]], label %[[DEFAULT:.*]] [
 // LLVM:   ]
 // LLVM: [[DEFAULT]]:
-// LLVM:   br label %[[EXIT:.*]]
-// LLVM: [[EXIT:.*]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z3sw3i
@@ -227,8 +217,6 @@ int sw4(int a) {
 // LLVM-DAG:     i32 42, label %[[CASE42:.*]]
 // LLVM:   ]
 // LLVM: [[CASE42]]:
-// LLVM:   br label %[[CASE42_BODY:.*]]
-// LLVM: [[CASE42_BODY]]:
 // LLVM:   store i32 3, ptr %[[RET_ADDR]], align 4
 // LLVM:   %[[RET3:.*]] = load i32, ptr %[[RET_ADDR]], align 4
 // LLVM:   ret i32 %[[RET3]]
@@ -284,8 +272,6 @@ void sw5(int a) {
 // LLVM: [[CASE1]]:
 // LLVM:   br label %[[EXIT:.*]]
 // LLVM: [[EXIT]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z3sw5i
@@ -347,28 +333,18 @@ void sw6(int a) {
 // LLVM-DAG:     i32 5, label %[[CASE5:.*]]
 // LLVM:   ]
 // LLVM: [[CASE0]]:
-// LLVM:   br label %[[CASE0_CONT:.*]]
-// LLVM: [[CASE0_CONT]]:
 // LLVM:   br label %[[CASE1]]
 // LLVM: [[CASE1]]:
-// LLVM:   br label %[[CASE1_CONT:.*]]
-// LLVM: [[CASE1_CONT]]:
 // LLVM:   br label %[[CASE2]]
 // LLVM: [[CASE2]]:
 // LLVM:   br label %[[EXIT:.*]]
 // LLVM: [[CASE3]]:
-// LLVM:   br label %[[CASE3_CONT:.*]]
-// LLVM: [[CASE3_CONT]]:
 // LLVM:   br label %[[CASE4]]
 // LLVM: [[CASE4]]:
-// LLVM:   br label %[[CASE4_CONT:.*]]
-// LLVM: [[CASE4_CONT]]:
 // LLVM:   br label %[[CASE5]]
 // LLVM: [[CASE5]]:
 // LLVM:   br label %[[EXIT]]
 // LLVM: [[EXIT]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z3sw6i
@@ -441,30 +417,18 @@ void sw7(int a) {
 // LLVM-DAG:     i32 5, label %[[CASE5:.*]]
 // LLVM:   ]
 // LLVM: [[CASE0]]:
-// LLVM:   br label %[[CASE0_CONT:.*]]
-// LLVM: [[CASE0_CONT]]:
 // LLVM:   br label %[[CASE1]]
 // LLVM: [[CASE1]]:
-// LLVM:   br label %[[CASE1_CONT:.*]]
-// LLVM: [[CASE1_CONT]]:
 // LLVM:   br label %[[CASE2]]
 // LLVM: [[CASE2]]:
-// LLVM:   br label %[[CASE2_CONT:.*]]
-// LLVM: [[CASE2_CONT]]:
 // LLVM:   br label %[[CASE3]]
 // LLVM: [[CASE3]]:
-// LLVM:   br label %[[CASE3_CONT:.*]]
-// LLVM: [[CASE3_CONT]]:
 // LLVM:   br label %[[CASE4]]
 // LLVM: [[CASE4]]:
-// LLVM:   br label %[[CASE4_CONT:.*]]
-// LLVM: [[CASE4_CONT]]:
 // LLVM:   br label %[[CASE5]]
 // LLVM: [[CASE5]]:
 // LLVM:   br label %[[EXIT]]
 // LLVM: [[EXIT]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z3sw7i
@@ -518,14 +482,10 @@ void sw8(int a) {
 // LLVM: [[CASE3]]:
 // LLVM:   br label %[[EXIT:.*]]
 // LLVM: [[CASE4]]:
-// LLVM:   br label %[[CASE4_CONT:.*]]
-// LLVM: [[CASE4_CONT]]:
 // LLVM:   br label %[[DEFAULT]]
 // LLVM: [[DEFAULT]]:
 // LLVM:   br label %[[EXIT:.*]]
 // LLVM: [[EXIT]]:
-// LLVM:    br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z3sw8i
@@ -576,14 +536,10 @@ void sw9(int a) {
 // LLVM: [[CASE3]]:
 // LLVM:   br label %[[EXIT:.*]]
 // LLVM: [[DEFAULT]]:
-// LLVM:   br label %[[DEFAULT_CONT:.*]]
-// LLVM: [[DEFAULT_CONT]]:
 // LLVM:   br label %[[CASE4]]
 // LLVM: [[CASE4]]:
 // LLVM:   br label %[[EXIT:.*]]
 // LLVM: [[EXIT]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z3sw9i
@@ -639,18 +595,12 @@ void sw10(int a) {
 // LLVM: [[CASE_3]]:
 // LLVM:   br label %[[EXIT:.*]]
 // LLVM: [[CASE_4]]:
-// LLVM:   br label %[[CASE4_CONT:.*]]
-// LLVM: [[CASE4_CONT]]:
 // LLVM:   br label %[[DEFAULT]]
 // LLVM: [[DEFAULT]]:
-// LLVM:   br label %[[DEFAULT_CONT:.*]]
-// LLVM: [[DEFAULT_CONT]]:
 // LLVM:   br label %[[CASE_5]]
 // LLVM: [[CASE_5]]:
 // LLVM:   br label %[[EXIT]]
 // LLVM: [[EXIT]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z4sw10i
@@ -719,26 +669,16 @@ void sw11(int a) {
 // LLVM: [[CASE_3]]:
 // LLVM:   br label %[[EXIT:.*]]
 // LLVM: [[CASE_4]]:
-// LLVM:   br label %[[CASE4_CONT:.*]]
-// LLVM: [[CASE4_CONT]]:
 // LLVM:   br label %[[CASE_5]]
 // LLVM: [[CASE_5]]:
-// LLVM:   br label %[[CASE5_CONT:.*]]
-// LLVM: [[CASE5_CONT]]:
 // LLVM:   br label %[[DEFAULT]]
 // LLVM: [[DEFAULT]]:
-// LLVM:   br label %[[DEFAULT_CONT:.*]]
-// LLVM: [[DEFAULT_CONT]]:
 // LLVM:   br label %[[CASE_6]]
 // LLVM: [[CASE_6]]:
-// LLVM:   br label %[[CASE6_CONT:.*]]
-// LLVM: [[CASE6_CONT]]:
 // LLVM:   br label %[[CASE_7]]
 // LLVM: [[CASE_7]]:
 // LLVM:   br label %[[EXIT]]
 // LLVM: [[EXIT]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z4sw11i
@@ -790,8 +730,6 @@ void sw12(int a) {
 // LLVM: [[UNREACHABLE:.*]]:
 // LLVM:   br label %[[EXIT:.*]]
 // LLVM: [[EXIT]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z4sw12i
@@ -837,8 +775,6 @@ void sw13(int a, int b) {
 // LLVM-DAG:     i32 1, label %[[CASE_A_1:.*]]
 // LLVM:   ]
 // LLVM: [[CASE_A_1]]:
-// LLVM:   br label %[[LOAD_B:.*]]
-// LLVM: [[LOAD_B]]:
 // LLVM:   %[[B_VAL:.*]] = load i32, ptr %[[B_ADDR:.*]], align 4
 // LLVM:   br label %[[INNER_SWITCH:.*]]
 // LLVM: [[INNER_SWITCH]]:
@@ -848,14 +784,8 @@ void sw13(int a, int b) {
 // LLVM: [[CASE_B_2]]:
 // LLVM:   br label %[[INNER_EXIT]]
 // LLVM: [[INNER_EXIT]]:
-// LLVM:   br label %[[INNER_EXIT_CONT:.*]]
-// LLVM: [[INNER_EXIT_CONT]]:
-// LLVM:   br label %[[MERGE:.*]]
-// LLVM: [[MERGE]]:
 // LLVM:   br label %[[OUTER_EXIT]]
 // LLVM: [[OUTER_EXIT]]:
-// LLVM:   br label %[[EXIT:.*]]
-// LLVM: [[EXIT]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z4sw13ii
@@ -919,24 +849,16 @@ void sw14(int x) {
 // LLVM-DAG:     i32 7, label %[[CASE7:.*]]
 // LLVM:   ]
 // LLVM: [[CASE1]]:
-// LLVM:   br label %[[AFTER1:.*]]
-// LLVM: [[AFTER1]]:
 // LLVM:   br label %[[CASE2]]
 // LLVM: [[CASE2]]:
-// LLVM:   br label %[[AFTER2:.*]]
-// LLVM: [[AFTER2]]:
 // LLVM:   br label %[[CASE3_TO_6]]
 // LLVM: [[CASE3_TO_6]]:
-// LLVM:   br label %[[AFTER3_6:.*]]
-// LLVM: [[AFTER3_6]]:
 // LLVM:   br label %[[CASE7]]
 // LLVM: [[CASE7]]:
 // LLVM:   br label %[[EXIT1:.*]]
 // LLVM: [[DEFAULT]]:
 // LLVM:   br label %[[EXIT1]]
 // LLVM: [[EXIT1]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z4sw14i
@@ -1002,8 +924,6 @@ void sw15(int x) {
 // LLVM-DAG:     i32 3, label %[[CASE3:.*]]
 // LLVM:   ]
 // LLVM: [[CASE1]]:
-// LLVM:   br label %[[CASE1_CONT:.*]]
-// LLVM: [[CASE1_CONT]]:
 // LLVM:   br label %[[CASE2]]
 // LLVM: [[CASE2]]:
 // LLVM:   store i32 0, ptr %[[Y_ADDR:.*]], align 4
@@ -1015,8 +935,6 @@ void sw15(int x) {
 // LLVM: [[DEFAULT]]:
 // LLVM:   br label %[[EXIT]]
 // LLVM: [[EXIT]]:
-// LLVM:   br label %[[RET:.*]]
-// LLVM: [[RET]]:
 // LLVM:   ret void
 
 // OGCG: define{{.*}} void @_Z4sw15i
@@ -1112,8 +1030,6 @@ int nested_switch(int a) {
 // LLVM:   %[[RET1:.*]] = load i32, ptr %[[RES_ADDR]], align 4
 // LLVM:   ret i32 %[[RET1]]
 // LLVM: [[CASE2]]:
-// LLVM:   br label %[[CASE2_BODY:.*]]
-// LLVM: [[CASE2_BODY]]:
 // LLVM:   %[[B2:.*]] = load i32, ptr %[[B_ADDR]], align 4
 // LLVM:   %[[B3:.*]] = add nsw i32 %[[B2]], 1
 // LLVM:   store i32 %[[B3]], ptr %[[B_ADDR]], align 4
diff --git a/clang/test/CIR/CodeGen/ternary-throw.cpp b/clang/test/CIR/CodeGen/ternary-throw.cpp
index 66671383f418eb..0fa8a3ed71d7cd 100644
--- a/clang/test/CIR/CodeGen/ternary-throw.cpp
+++ b/clang/test/CIR/CodeGen/ternary-throw.cpp
@@ -36,15 +36,13 @@ const int& test_cond_throw_false(bool flag) {
 // LLVMCIR: %[[LOAD:.*]] = load i8, ptr %[[FLAG_ALLOCA]]
 // LLVMCIR: %[[BOOL:.*]] = trunc i8 %[[LOAD]] to i1
 // LLVMCIR: br i1 %[[BOOL]], label %[[TRUE_BB:.*]], label %[[FALSE_BB:.*]]
-// LLVMCIR: [[TRUE_BB]]:
-// LLVMCIR:   br label %[[PHI_BB:.*]]
 // LLVMCIR: [[FALSE_BB]]:
 // LLVMCIR:   %[[EXC:.*]] = call{{.*}} ptr @__cxa_allocate_exception
 // LLVMCIR:   store i32 0, ptr %[[EXC]]
 // LLVMCIR:   call void @__cxa_throw(ptr %[[EXC]], ptr @_ZTIi
 // LLVMCIR:   unreachable
-// LLVMCIR: [[PHI_BB]]:
-// LLVMCIR:   %[[PHI:.*]] = phi ptr [ %[[A_ALLOCA]], %[[TRUE_BB]] ]
+// LLVMCIR: [[TRUE_BB]]:{{.*}}; preds = %[[ENTRY:[0-9]+]]
+// LLVMCIR:   %[[PHI:.*]] = phi ptr [ %[[A_ALLOCA]], %[[ENTRY]] ]
 // LLVMCIR:   br label %[[CONT_BB:.*]]
 // LLVMCIR: [[CONT_BB]]:
 // LLVMCIR:   store ptr %[[PHI]], ptr %[[RET_ALLOCA]]
@@ -104,10 +102,8 @@ const int& test_cond_throw_true(bool flag) {
 // LLVMCIR:   store i32 0, ptr %[[EXC]]
 // LLVMCIR:   call void @__cxa_throw(ptr %[[EXC]], ptr @_ZTIi
 // LLVMCIR:   unreachable
-// LLVMCIR: [[FALSE_BB]]:
-// LLVMCIR:   br label %[[PHI_BB:.*]]
-// LLVMCIR: [[PHI_BB]]:
-// LLVMCIR:   %[[PHI:.*]] = phi ptr [ %[[A_ALLOCA]], %[[FALSE_BB]] ]
+// LLVMCIR: [[FALSE_BB]]:{{.*}}; preds = %[[ENTRY:[0-9]+]]
+// LLVMCIR:   %[[PHI:.*]] = phi ptr [ %[[A_ALLOCA]], %[[ENTRY]] ]
 // LLVMCIR:   br label %[[CONT_BB:.*]]
 // LLVMCIR: [[CONT_BB]]:
 // LLVMCIR:   store ptr %[[PHI]], ptr %[[RET_ALLOCA]]
@@ -271,15 +267,13 @@ int test_agg_cond_throw_false(bool flag, struct s6 a1, struct s6 a2) {
 // LLVMCIR: %[[FLAG_LOAD:.*]] = load i8, ptr %[[FLAG_ALLOCA]]
 // LLVMCIR: %[[BOOL:.*]] = trunc i8 %[[FLAG_LOAD]] to i1
 // LLVMCIR: br i1 %[[BOOL]], label %[[TRUE_BB:.*]], label %[[FALSE_BB:.*]]
-// LLVMCIR: [[TRUE_BB]]:
-// LLVMCIR:   br label %[[PHI_BB:.*]]
 // LLVMCIR: [[FALSE_BB]]:
 // LLVMCIR:   %[[EXC:.*]] = call{{.*}} ptr @__cxa_allocate_exception
 // LLVMCIR:   store i32 0, ptr %[[EXC]]
 // LLVMCIR:   call void @__cxa_throw(ptr %[[EXC]], ptr @_ZTIi
 // LLVMCIR:   unreachable
-// LLVMCIR: [[PHI_BB]]:
-// LLVMCIR:   %[[PHI:.*]] = phi ptr [ %[[A1_ALLOCA]], %[[TRUE_BB]] ]
+// LLVMCIR: [[TRUE_BB]]:{{.*}}; preds = %[[ENTRY:[0-9]+]]
+// LLVMCIR:   %[[PHI:.*]] = phi ptr [ %[[A1_ALLOCA]], %[[ENTRY]] ]
 // LLVMCIR:   br label %[[CONT_BB:.*]]
 // LLVMCIR: [[CONT_BB]]:
 // LLVMCIR:   %[[F0_PTR:.*]] = getelementptr inbounds nuw %struct.s6, ptr %[[PHI]], i32 0, i32 0
@@ -341,10 +335,8 @@ int test_agg_cond_throw_true(bool flag, struct s6 a1, struct s6 a2) {
 // LLVMCIR:   store i32 0, ptr %[[EXC]]
 // LLVMCIR:   call void @__cxa_throw(ptr %[[EXC]], ptr @_ZTIi
 // LLVMCIR:   unreachable
-// LLVMCIR: [[FALSE_BB]]:
-// LLVMCIR:   br label %[[PHI_BB:.*]]
-// LLVMCIR: [[PHI_BB]]:
-// LLVMCIR:   %[[PHI:.*]] = phi ptr [ %[[A1_ALLOCA]], %[[FALSE_BB]] ]
+// LLVMCIR: [[FALSE_BB]]:{{.*}}; preds = %[[ENTRY:[0-9]+]]
+// LLVMCIR:   %[[PHI:.*]] = phi ptr [ %[[A1_ALLOCA]], %[[ENTRY]] ]
 // LLVMCIR:   br label %[[CONT_BB:.*]]
 // LLVMCIR: [[CONT_BB]]:
 // LLVMCIR:   %[[F0_PTR:.*]] = getelementptr inbounds nuw %struct.s6, ptr %[[PHI]], i32 0, i32 0
diff --git a/clang/test/CIR/CodeGen/ternary.cpp b/clang/test/CIR/CodeGen/ternary.cpp
index 23191416f0376e..9a6b5c46436033 100644
--- a/clang/test/CIR/CodeGen/ternary.cpp
+++ b/clang/test/CIR/CodeGen/ternary.cpp
@@ -102,13 +102,11 @@ int foo(int a, int b) {
 // LLVM: [[MERGE_BB]]:
 // LLVM: %[[PHI:.*]] = phi i32 [ %[[AVAL2]], %[[FALSE_BB]] ], [ 0, %[[TRUE_BB]] ]
 // LLVM: %[[COND:.*]] = icmp ne i32 %[[PHI]], 0
-// LLVM: br i1 %[[COND]], label %[[RETURN_MINUS_ONE:.*]], label %[[CONT_BB:.*]]
+// LLVM: br i1 %[[COND]], label %[[RETURN_MINUS_ONE:.*]], label %[[RETURN_ZERO:.*]]
 // LLVM: [[RETURN_MINUS_ONE]]:
 // LLVM: store i32 -1, ptr %[[RETVAL]]
 // LLVM: %[[RET1:.*]] = load i32, ptr %[[RETVAL]]
 // LLVM: ret i32 %[[RET1]]
-// LLVM: [[CONT_BB]]:
-// LLVM: br label %[[RETURN_ZERO:.*]]
 // LLVM: [[RETURN_ZERO]]:
 // LLVM: store i32 0, ptr %[[RETVAL]]
 // LLVM: %[[RET2:.*]] = load i32, ptr %[[RETVAL]]
diff --git a/clang/test/CIR/CodeGen/three-way-cmp.cpp b/clang/test/CIR/CodeGen/three-way-cmp.cpp
index 886199b4f6ae14..1adb1eaf73c462 100644
--- a/clang/test/CIR/CodeGen/three-way-cmp.cpp
+++ b/clang/test/CIR/CodeGen/three-way-cmp.cpp
@@ -251,9 +251,6 @@ void use_pseudo_ordering(HasMember m1, HasMember m2) {
   // LLVM-NEXT:   ret i8 %[[RES_TRUE]]
   //
   // LLVM: [[SO_NE_RES_FALSE]]:
-  // LLVM:   br label %[[SO_NE_RES_FALSE_CTD:.*]]
-  //
-  // LLVM: [[SO_NE_RES_FALSE_CTD]]:
   // LLVM:   call void @llvm.memcpy.p0.p0.i64(ptr align 1 %[[RESULT_SLOT]], ptr align 1 @_ZNSt3__115strong_ordering5equalE, i64 1, i1 false)
   // LLVM-NEXT:   %[[RES_FALSE:.*]] = load i8, ptr %[[RESULT_SLOT]], align 1
   // LLVM-NEXT:   ret i8 %[[RES_FALSE]]
diff --git a/clang/test/CIR/CodeGen/throws.cpp b/clang/test/CIR/CodeGen/throws.cpp
index 5e469e141e7067..c217b2e872bcc7 100644
--- a/clang/test/CIR/CodeGen/throws.cpp
+++ b/clang/test/CIR/CodeGen/throws.cpp
@@ -193,12 +193,10 @@ int rethrow_from_block(int a, int b) {
 // LLVM: [[CHECK_COND]]:
 // LLVM:  %[[TMP_B:.*]] = load i32, ptr %[[B_ADDR]], align 4
 // LLVM:  %[[IS_B_ZERO:.*]] = icmp eq i32 %[[TMP_B]], 0
-// LLVM:  br i1 %[[IS_B_ZERO]], label %[[IF_THEN:.*]], label %[[IF_ELSE:.*]]
+// LLVM:  br i1 %[[IS_B_ZERO]], label %[[IF_THEN:.*]], label %[[IF_END:.*]]
 // LLVM: [[IF_THEN]]:
 // LLVM:  call void @__cxa_rethrow()
 // LLVM:  unreachable
-// LLVM: [[IF_ELSE]]:
-// LLVM:  br label %[[IF_END:.*]]
 // LLVM: [[IF_END]]:
 // LLVM:  %[[TMP_A:.*]] = load i32, ptr %[[A_ADDR]], align 4
 // LLVM:  %[[TMP_B:.*]] = load i32, ptr %[[B_ADDR]], align 4
diff --git a/clang/test/CIR/CodeGen/try-catch.cpp b/clang/test/CIR/CodeGen/try-catch.cpp
index 74f30831d3e190..bf6ed71135b10a 100644
--- a/clang/test/CIR/CodeGen/try-catch.cpp
+++ b/clang/test/CIR/CodeGen/try-catch.cpp
@@ -61,8 +61,6 @@ void try_catch_with_empty_catch_all() {
 // LLVM:   store i32 1, ptr %[[A_ADDR]], align 4
 // LLVM:   br label %[[BB_2:.*]]
 // LLVM: [[BB_2]]:
-// LLVM:   br label %[[BB_3:.*]]
-// LLVM: [[BB_3]]:
 // LLVM:   ret void
 // LLVM: [[BB_4:.*]]:
 // LLVM:   %[[TMP_A:.*]] = load i32, ptr %[[A_ADDR]], align 4
@@ -70,8 +68,6 @@ void try_catch_with_empty_catch_all() {
 // LLVM:   store i32 %[[RESULT]], ptr %[[A_ADDR]], align 4
 // LLVM:   br label %[[BB_7:.*]]
 // LLVM: [[BB_7]]:
-// LLVM:   br label %[[BB_8:.*]]
-// LLVM: [[BB_8]]:
 // LLVM:   ret void
 
 // OGCG: %[[A_ADDR:.*]] = alloca i32, align 4
@@ -103,15 +99,11 @@ void try_catch_with_empty_catch_all_2() {
 // LLVM:   store i32 1, ptr %[[A_ADDR]], align 4
 // LLVM:   br label %[[BB_2:.*]]
 // LLVM: [[BB_2]]:
-// LLVM:   br label %[[BB_3:.*]]
-// LLVM: [[BB_3]]:
 // LLVM:   %[[TMP_A:.*]] = load i32, ptr %[[A_ADDR]], align 4
 // LLVM:   %[[RESULT:.*]] = add nsw i32 %[[TMP_A:.*]], 1
 // LLVM:   store i32 %[[RESULT]], ptr %[[A_ADDR]], align 4
 // LLVM:   ret void
 // LLVM: [[BB_6:.*]]:
-// LLVM:   br label %[[BB_7:.*]]
-// LLVM: [[BB_7]]:
 // LLVM:   ret void
 
 // OGCG: %[[A_ADDR:.*]] = alloca i32, align 4
@@ -149,16 +141,12 @@ void try_catch_with_alloca() {
 // LLVM:  %[[C_ADDR:.*]] = alloca i32, align 4
 // LLVM:  br label %[[LABEL_1:.*]]
 // LLVM: [[LABEL_1]]:
-// LLVM:  br label %[[LABEL_2:.*]]
-// LLVM: [[LABEL_2]]:
 // LLVM:  %[[TMP_A:.*]] = load i32, ptr %[[A_ADDR]], align 4
 // LLVM:  %[[TMP_B:.*]] = load i32, ptr %[[B_ADDR]], align 4
 // LLVM:  %[[RESULT:.*]] = add nsw i32 %[[TMP_A]], %[[TMP_B]]
 // LLVM:  store i32 %[[RESULT]], ptr %[[C_ADDR]], align 4
 // LLVM:  br label %[[LABEL_3:.*]]
 // LLVM: [[LABEL_3]]:
-// LLVM:  br label %[[LABEL_4:.*]]
-// LLVM: [[LABEL_4]]:
 // LLVM:  ret void
 
 // OGCG: %[[A_ADDR:.*]] = alloca i32, align 4
@@ -187,13 +175,9 @@ void calling_noexcept_function_inside_try_block() {
 
 // LLVM:   br label %[[LABEL_1:.*]]
 // LLVM: [[LABEL_1]]:
-// LLVM:   br label %[[LABEL_2:.*]]
-// LLVM: [[LABEL_2]]:
 // LLVM:   call void @_Z22function_with_noexceptv()
 // LLVM:   br label %[[LABEL_3:.*]]
 // LLVM: [[LABEL_3]]:
-// LLVM:   br label %[[LABEL_4:.*]]
-// LLVM: [[LABEL_4]]:
 // LLVM:   ret void
 
 // OGCG: call void @_Z22function_with_noexceptv()
@@ -228,12 +212,10 @@ void call_function_inside_try_catch_all() {
 // LLVM: define {{.*}} void @_Z34call_function_inside_try_catch_allv() {{.*}} personality ptr @__gxx_personality_v0
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr null
@@ -248,18 +230,12 @@ void call_function_inside_try_catch_all() {
 // LLVM:   %[[EXN_OBJ_PHI1:.*]] = phi ptr [ %[[EXN_OBJ:.*]], %[[LANDING_PAD:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI1:.*]] = phi i32 [ %[[EH_SELECTOR_VAL:.*]], %[[LANDING_PAD:.*]] ]
 // LLVM:   %[[TOKEN:.*]] = call ptr @__cxa_begin_catch(ptr %[[EXN_OBJ_PHI1]])
-// LLVM:   br label %[[CATCH_BODY:.*]]
-// LLVM: [[CATCH_BODY]]:
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
@@ -316,12 +292,10 @@ void call_function_inside_try_catch_with_exception_type() {
 // LLVM: define {{.*}} void @_Z50call_function_inside_try_catch_with_exception_typev() {{.*}} personality ptr @__gxx_personality_v0
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTIi
@@ -347,19 +321,15 @@ void call_function_inside_try_catch_with_exception_type() {
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[RESUME]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TMP_EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_OBJ_PHI3]], 0
 // LLVM:   %[[EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } %[[TMP_EXCEPTION_INFO]], i32 %[[EH_SELECTOR_PHI3]], 1
 // LLVM:   resume { ptr, i32 } %[[EXCEPTION_INFO]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
@@ -430,12 +400,10 @@ void call_function_inside_try_catch_with_ref_exception_type() {
 // LLVM: define {{.*}} void @_Z54call_function_inside_try_catch_with_ref_exception_typev() {{.*}} personality ptr @__gxx_personality_v0
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT:.*]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTIi
@@ -461,19 +429,15 @@ void call_function_inside_try_catch_with_ref_exception_type() {
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[RESUME]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TMP_EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_OBJ_PHI3]], 0
 // LLVM:   %[[EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } %[[TMP_EXCEPTION_INFO]], i32 %[[EH_SELECTOR_PHI3]], 1
 // LLVM:   resume { ptr, i32 } %[[EXCEPTION_INFO]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
@@ -543,12 +507,10 @@ void call_function_inside_try_catch_with_complex_exception_type() {
 // LLVM: define {{.*}} void @_Z58call_function_inside_try_catch_with_complex_exception_typev() {{.*}} personality ptr @__gxx_personality_v0
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTICi
@@ -574,19 +536,15 @@ void call_function_inside_try_catch_with_complex_exception_type() {
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[RESUME]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TMP_EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_OBJ_PHI3]], 0
 // LLVM:   %[[EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } %[[TMP_EXCEPTION_INFO]], i32 %[[EH_SELECTOR_PHI3]], 1
 // LLVM:   resume { ptr, i32 } %[[EXCEPTION_INFO]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
@@ -663,12 +621,10 @@ void call_function_inside_try_catch_with_array_exception_type() {
 // LLVM: define {{.*}} void @_Z56call_function_inside_try_catch_with_array_exception_typev() {{.*}} personality ptr @__gxx_personality_v0
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTIPi
@@ -694,19 +650,15 @@ void call_function_inside_try_catch_with_array_exception_type() {
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[RESUME]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TMP_EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_OBJ_PHI3]], 0
 // LLVM:   %[[EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } %[[TMP_EXCEPTION_INFO]], i32 %[[EH_SELECTOR_PHI3]], 1
 // LLVM:   resume { ptr, i32 } %[[EXCEPTION_INFO]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
@@ -784,12 +736,10 @@ void call_function_inside_try_catch_with_exception_type_and_catch_all() {
 // LLVM: define {{.*}} void @_Z64call_function_inside_try_catch_with_exception_type_and_catch_allv() {{.*}} personality ptr @__gxx_personality_v0
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTIi
@@ -815,27 +765,19 @@ void call_function_inside_try_catch_with_exception_type_and_catch_all() {
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[CATCH_ALL]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TOKEN2:.*]] = call ptr @__cxa_begin_catch(ptr %[[EXN_OBJ_PHI3]])
-// LLVM:   br label %[[CATCH_ALL_BODY:.*]]
-// LLVM: [[CATCH_ALL_BODY]]:
 // LLVM:   br label %[[END_CATCH2:.*]]
 // LLVM: [[END_CATCH2]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH2:.*]]
-// LLVM: [[END_DISPATCH2]]:
 // LLVM:   br label %[[END_TRY2:.*]]
 // LLVM: [[END_TRY2]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
@@ -912,10 +854,6 @@ void cleanup_inside_try_body() {
 // CIR: }
 
 // LLVM: define {{.*}} void @_Z23cleanup_inside_try_bodyv() {{.*}} personality ptr @__gxx_personality_v0
-// LLVM:   br label %[[TRY_SCOPE:.*]]
-// LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   br label %[[CLEANUP_SCOPE:.*]]
 // LLVM: [[CLEANUP_SCOPE]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
@@ -925,8 +863,6 @@ void cleanup_inside_try_body() {
 // LLVM: [[CLEANUP]]:
 // LLVM:   call void @_ZN1SD1Ev(ptr {{.*}})
 // LLVM:   br label %[[END_CLEANUP:.*]]
-// LLVM: [[END_CLEANUP]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr null
@@ -938,6 +874,8 @@ void cleanup_inside_try_body() {
 // LLVM:   %[[EH_SELECTOR_PHI:.*]] = phi i32 [ %[[EH_SELECTOR_VAL:.*]], %[[LANDING_PAD:.*]] ]
 // LLVM:   call void @_ZN1SD1Ev(ptr {{.*}})
 // LLVM:   br label %[[CATCH:.*]]
+// LLVM: [[END_CLEANUP]]:
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[CATCH]]:
 // LLVM:   %[[EXN_OBJ_PHI1:.*]] = phi ptr [ %[[EXN_OBJ_PHI:.*]], %[[CLEANUP_LANDING:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI1:.*]] = phi i32 [ %[[EH_SELECTOR_PHI:.*]], %[[CLEANUP_LANDING:.*]] ]
@@ -946,18 +884,12 @@ void cleanup_inside_try_body() {
 // LLVM:   %[[EXN_OBJ_PHI2:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[CATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI2:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[CATCH:.*]] ]
 // LLVM:   %[[TOKEN:.*]] = call ptr @__cxa_begin_catch(ptr %[[EXN_OBJ_PHI2]])
-// LLVM:   br label %[[CATCH_BODY:.*]]
-// LLVM: [[CATCH_BODY]]:
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
@@ -1020,12 +952,10 @@ void call_function_inside_try_catch_with_aggregate_exception_type() {
 // LLVM: define {{.*}} void @_Z60call_function_inside_try_catch_with_aggregate_exception_typev() {{.*}} personality ptr @__gxx_personality_v0
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTI11CustomError
@@ -1051,19 +981,15 @@ void call_function_inside_try_catch_with_aggregate_exception_type() {
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[RESUME]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TMP_EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_OBJ_PHI3]], 0
 // LLVM:   %[[EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } %[[TMP_EXCEPTION_INFO]], i32 %[[EH_SELECTOR_PHI3]], 1
 // LLVM:   resume { ptr, i32 } %[[EXCEPTION_INFO]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
@@ -1140,12 +1066,10 @@ void call_function_inside_try_catch_with_ref_ptr_of_record_exception_type() {
 // LLVM:   %[[E_ADDR:.*]] = alloca ptr, align 8
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT:.*]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTIP6Record
@@ -1173,19 +1097,15 @@ void call_function_inside_try_catch_with_ref_ptr_of_record_exception_type() {
 // LLVM-NEXT:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[RESUME]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TMP_EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_OBJ_PHI3]], 0
 // LLVM:   %[[EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } %[[TMP_EXCEPTION_INFO]], i32 %[[EH_SELECTOR_PHI3]], 1
 // LLVM:   resume { ptr, i32 } %[[EXCEPTION_INFO]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
@@ -1257,12 +1177,10 @@ void call_function_inside_try_catch_with_exception_member_ptr_type() {
 // LLVM: define {{.*}} void @_Z61call_function_inside_try_catch_with_exception_member_ptr_typev() {{.*}} personality ptr @__gxx_personality_v0
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTIM6Recordi
@@ -1288,19 +1206,15 @@ void call_function_inside_try_catch_with_exception_member_ptr_type() {
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[RESUME]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TMP_EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_OBJ_PHI3]], 0
 // LLVM:   %[[EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } %[[TMP_EXCEPTION_INFO]], i32 %[[EH_SELECTOR_PHI3]], 1
 // LLVM:   resume { ptr, i32 } %[[EXCEPTION_INFO]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
 
@@ -1386,12 +1300,10 @@ int init_catch_param_with_type_int() {
 // LLVM:   %[[X_ADDR:.*]] = alloca i32, align 4
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTIi
@@ -1421,19 +1333,15 @@ int init_catch_param_with_type_int() {
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[RESUME]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TMP_EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_OBJ_PHI3]], 0
 // LLVM:   %[[EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } %[[TMP_EXCEPTION_INFO]], i32 %[[EH_SELECTOR_PHI3]], 1
 // LLVM:   resume { ptr, i32 } %[[EXCEPTION_INFO]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   %[[TMP_RV:.*]] = load i32, ptr %[[RV_ADDR]], align 4
 // LLVM:   store i32 %[[TMP_RV]], ptr %[[RET_ADDR]], align 4
@@ -1528,12 +1436,10 @@ int init_catch_param_with_type_int_ptr() {
 // LLVM:   %[[X_ADDR:.*]] = alloca ptr, align 8
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTIPi
@@ -1562,19 +1468,15 @@ int init_catch_param_with_type_int_ptr() {
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[RESUME]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TMP_EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_OBJ_PHI3]], 0
 // LLVM:   %[[EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } %[[TMP_EXCEPTION_INFO]], i32 %[[EH_SELECTOR_PHI3]], 1
 // LLVM:   resume { ptr, i32 } %[[EXCEPTION_INFO]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   %[[TMP_RV:.*]] = load i32, ptr %[[RV_ADDR]], align 4
 // LLVM:   store i32 %[[TMP_RV]], ptr %[[RET_ADDR]], align 4
@@ -1671,12 +1573,10 @@ int init_catch_param_with_ref_to_ptr_to_non_record() {
 // LLVM:   %[[P_ADDR:.*]] = alloca ptr, align 8
 // LLVM:   br label %[[TRY_SCOPE:.*]]
 // LLVM: [[TRY_SCOPE]]:
-// LLVM:   br label %[[TRY_BEGIN:.*]]
-// LLVM: [[TRY_BEGIN]]:
 // LLVM:   %[[CALL:.*]] = invoke noundef i32 @_Z8divisionv()
 // LLVM:           to label %[[INVOKE_CONT:.*]] unwind label %[[LANDING_PAD:.*]]
 // LLVM: [[INVOKE_CONT]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[LANDING_PAD]]:
 // LLVM:   %[[LP:.*]] = landingpad { ptr, i32 }
 // LLVM:           catch ptr @_ZTIPi
@@ -1708,19 +1608,15 @@ int init_catch_param_with_ref_to_ptr_to_non_record() {
 // LLVM:   br label %[[END_CATCH:.*]]
 // LLVM: [[END_CATCH]]:
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
 // LLVM: [[END_TRY]]:
-// LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM:   br label %[[DONE]]
 // LLVM: [[RESUME]]:
 // LLVM:   %[[EXN_OBJ_PHI3:.*]] = phi ptr [ %[[EXN_OBJ_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[EH_SELECTOR_PHI3:.*]] = phi i32 [ %[[EH_SELECTOR_PHI1:.*]], %[[DISPATCH:.*]] ]
 // LLVM:   %[[TMP_EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } poison, ptr %[[EXN_OBJ_PHI3]], 0
 // LLVM:   %[[EXCEPTION_INFO:.*]] = insertvalue { ptr, i32 } %[[TMP_EXCEPTION_INFO]], i32 %[[EH_SELECTOR_PHI3]], 1
 // LLVM:   resume { ptr, i32 } %[[EXCEPTION_INFO]]
-// LLVM: [[TRY_CONT]]:
-// LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   %[[TMP_RV:.*]] = load i32, ptr %[[RV_ADDR]], align 4
 // LLVM:   store i32 %[[TMP_RV]], ptr %[[RET_ADDR]], align 4
@@ -1826,15 +1722,11 @@ void direct_inside_try_catch_with_exception_type() {
 // LLVM:   %[[EH_SELECTOR:.*]] = phi i32
 // LLVM:   %[[BEGIN_CATCH:.*]] = call ptr @__cxa_begin_catch(ptr %[[EXN_PTR]])
 // LLVM:   call void @__cxa_end_catch()
-// LLVM:   br label %[[AFTER_CATCH:.*]]
-// LLVM: [[AFTER_CATCH]]:
-// LLVM:   br label %[[END_DISPATCH:.*]]
-// LLVM: [[END_DISPATCH]]:
 // LLVM:   br label %[[END_TRY:.*]]
-// LLVM: [[RESUME]]:
-// LLVM:   resume { ptr, i32 }
 // LLVM: [[END_TRY]]:
 // LLVM:   br label %[[TRY_CONT:.*]]
+// LLVM: [[RESUME]]:
+// LLVM:   resume { ptr, i32 }
 // LLVM: [[TRY_CONT]]:
 // LLVM:   ret void
 
@@ -2017,9 +1909,9 @@ void init_catch_param_with_ref_to_ptr_to_ptr_to_record() {
 // LLVM:   %[[EXN_OBJ:.*]] = getelementptr i8, ptr %[[EXN:.*]], i64 32
 // LLVM-NEXT:   store ptr %[[EXN_OBJ]], ptr %[[PP_ADDR]], align 8
 // LLVM-NEXT:   %{{.*}} = call ptr @__cxa_begin_catch(ptr %[[EXN]])
-// LLVM-NEXT:   br label %[[CATCH_BODY:.+]]
-// LLVM:      [[CATCH_BODY]]:
-// LLVM-NEXT:   br label
+// LLVM-NEXT:   br label %[[END_CATCH:.+]]
+// LLVM:      [[END_CATCH]]:
+// LLVM-NEXT:   call void @__cxa_end_catch()
 // OGCG:   %{{.*}} = alloca i32, align 4
 // OGCG-NEXT:   %[[PP_ADDR:.*]] = alloca ptr, align 8
 // OGCG:   %{{.*}} = call ptr @__cxa_begin_catch(ptr %[[EXN:.*]])
diff --git a/clang/test/CIR/CodeGen/virtual-fn-calls-eh.cpp b/clang/test/CIR/CodeGen/virtual-fn-calls-eh.cpp
index 423759a424d173..4ad354955bc8fd 100644
--- a/clang/test/CIR/CodeGen/virtual-fn-calls-eh.cpp
+++ b/clang/test/CIR/CodeGen/virtual-fn-calls-eh.cpp
@@ -65,8 +65,6 @@ void call_virtual_fn_in_cleanup_scope() {
 // LLVM:   br label %[[NORMAL_CLEANUP:.*]]
 // LLVM: [[NORMAL_CLEANUP]]:
 // LLVM:   call void @_ZN1BD1Ev(ptr {{.*}} %[[B]])
-// LLVM:   br label %[[EXIT_CLEANUP_SCOPE:.*]]
-// LLVM: [[EXIT_CLEANUP_SCOPE]]:
 // LLVM:   br label %[[DONE:.*]]
 // LLVM: [[UNWIND]]:
 // LLVM:   %[[EXN:.*]] = landingpad { ptr, i32 }
diff --git a/clang/test/CIR/CodeGen/vla.c b/clang/test/CIR/CodeGen/vla.c
index db1d58415d092f..47db991f985daf 100644
--- a/clang/test/CIR/CodeGen/vla.c
+++ b/clang/test/CIR/CodeGen/vla.c
@@ -254,8 +254,6 @@ void f3(unsigned len) {
 // LLVM:   %[[CMP:.*]] = icmp ult i32 %[[NEXT]], %[[LEN2]]
 // LLVM:   br i1 %[[CMP]], label %[[WHILE_BODY:.*]], label %[[WHILE_END:.*]]
 // LLVM: [[WHILE_BODY]]:
-// LLVM:   br label %[[WHILE_BODY2:.*]]
-// LLVM: [[WHILE_BODY2]]:
 // LLVM:   %[[I_LEN:.*]] = load i32, ptr %[[I]]
 // LLVM:   %[[I_LEN_SIZE_T2:.*]] = zext i32 %[[I_LEN]] to i64
 // LLVM:   %[[STACK_PTR2:.*]] = call ptr @llvm.stacksave.p0()
@@ -267,8 +265,6 @@ void f3(unsigned len) {
 // LLVM: [[WHILE_BODY_END]]:
 // LLVM:   br label %[[WHILE_COND]]
 // LLVM: [[WHILE_END]]:
-// LLVM:   br label %[[F3_END:.*]]
-// LLVM: [[F3_END]]:
 // LLVM:   %[[STACK_RESTORE_PTR:.*]] = load ptr, ptr %[[SAVED_STACK]]
 // LLVM:   call void @llvm.stackrestore.p0(ptr %[[STACK_RESTORE_PTR]])
 
@@ -544,8 +540,6 @@ void complex_vla_cast(int n) {
 // LLVM: [[CLEANUP_BODY]]:
 // LLVM:   %[[STACK_RESTORE_PTR:.*]] = load ptr, ptr %[[SAVED_STACK]], align 8
 // LLVM:   call void @llvm.stackrestore.p0(ptr %[[STACK_RESTORE_PTR]])
-// LLVM:   br label %[[CLEANUP_END:.*]]
-// LLVM: [[CLEANUP_END]]:
 // LLVM:   br label %[[DONE:.*]]
 // LLVM: [[DONE]]:
 // LLVM:   ret void
diff --git a/clang/test/CIR/CodeGenBuiltins/builtin-bcopy.cpp b/clang/test/CIR/CodeGenBuiltins/builtin-bcopy.cpp
index 2dbdb5b0d27894..03a20109d3eadc 100644
--- a/clang/test/CIR/CodeGenBuiltins/builtin-bcopy.cpp
+++ b/clang/test/CIR/CodeGenBuiltins/builtin-bcopy.cpp
@@ -57,9 +57,9 @@ void test_conditional_bcopy(void) {
   // LLVM-NOT: phi
 
   // OGCG-LABEL: define{{.*}} void @_Z22test_conditional_bcopyv
-  // LLVM: br
+  // OGCG: br
   // OGCG: call void @llvm.memmove
-  // LLVM: br
+  // OGCG: br
   // OGCG: call void @llvm.memmove
   // OGCG-NOT: phi
 
diff --git a/clang/test/CIR/CodeGenOpenMP/omp-llvmir.c b/clang/test/CIR/CodeGenOpenMP/omp-llvmir.c
index 383c3b483a5051..77fab40da91148 100644
--- a/clang/test/CIR/CodeGenOpenMP/omp-llvmir.c
+++ b/clang/test/CIR/CodeGenOpenMP/omp-llvmir.c
@@ -88,9 +88,6 @@
 // LLVM: br i1 %[[CMP]], label %[[PAR_REGION4:.*]], label %[[PAR_REGION6:.*]]
 
 // LLVM: [[PAR_REGION6]]:
-// LLVM: br label %[[PAR_REGION7:.*]]
-
-// LLVM: [[PAR_REGION7]]:
 // LLVM: br label %[[REGION_CONT:.*]]
 
 // LLVM: [[REGION_CONT]]:
diff --git a/clang/test/CIR/CodeGenSYCL/address-space-deduction.cpp b/clang/test/CIR/CodeGenSYCL/address-space-deduction.cpp
index 22032fcfa070e2..958e8a3ec36e2a 100644
--- a/clang/test/CIR/CodeGenSYCL/address-space-deduction.cpp
+++ b/clang/test/CIR/CodeGenSYCL/address-space-deduction.cpp
@@ -120,8 +120,6 @@
 // LLVM-NEXT: store i32 44, ptr addrspace(4) %[[TMP15]], align 4
 // LLVM-NEXT: br label %[[TMP14]]
 // LLVM: [[TMP14]]:
-// LLVM-NEXT: br label %[[TMP16:.*]]
-// LLVM: [[TMP16]]:
 // LLVM-NEXT: ret void
 
 // OGCG-LABEL: define {{.*}}spir_func void @_Z4testv(
diff --git a/clang/test/CIR/Lowering/func-simple.cpp b/clang/test/CIR/Lowering/func-simple.cpp
index 2d904d9e83e3d8..fbc3b3a45e7841 100644
--- a/clang/test/CIR/Lowering/func-simple.cpp
+++ b/clang/test/CIR/Lowering/func-simple.cpp
@@ -27,14 +27,10 @@ int scopes() {
 // CHECK:   %[[RV:.*]] = alloca i32, align 4
 // CHECK:   br label %[[LABEL1:.*]]
 // CHECK: [[LABEL1]]:
-// CHECK:   br label %[[LABEL2:.*]]
-// CHECK: [[LABEL2]]:
 // CHECK:   store i32 99, ptr %[[RV]], align 4
 // CHECK:   %[[R:.*]] = load i32, ptr %[[RV]], align 4
 // CHECK:   ret i32 %[[R]]
 // CHECK: [[LABEL3:.*]]:
-// CHECK:   br label %[[LABEL4:.*]]
-// CHECK: [[LABEL4]]:
 // CHECK:   call void @llvm.trap()
 // CHECK:   unreachable
 // CHECK: }
diff --git a/clang/test/CIR/Lowering/goto.cir b/clang/test/CIR/Lowering/goto.cir
index 9eb1b358aca9f3..e01e44cc525fdf 100644
--- a/clang/test/CIR/Lowering/goto.cir
+++ b/clang/test/CIR/Lowering/goto.cir
@@ -32,11 +32,7 @@ module {
 // MLIR:  llvm.func @gotoFromIf
 // MLIR:    %[[#Minus_one:]] = llvm.mlir.constant(-1 : i32) : i32
 // MLIR:    %[[#Zero:]] = llvm.mlir.constant(0 : i32) : i32
-// MLIR:    llvm.cond_br {{.*}}, ^bb[[#COND_YES:]], ^bb[[#COND_NO:]]
-// MLIR:  ^bb[[#COND_YES]]:
-// MLIR:    llvm.br ^bb[[#GOTO_BLK:]]
-// MLIR:   ^bb[[#COND_NO]]:
-// MLIR:    llvm.br ^bb[[#BLK:]]
+// MLIR:    llvm.cond_br {{.*}}, ^bb[[#GOTO_BLK:]], ^bb[[#BLK:]]
 // MLIR:  ^bb[[#BLK]]:
 // MLIR:    llvm.store %[[#Zero]], %[[#Ret_val_addr:]] {{.*}}: i32, !llvm.ptr
 // MLIR:    llvm.br ^bb[[#RETURN:]]
diff --git a/clang/test/CIR/Lowering/switch.cir b/clang/test/CIR/Lowering/switch.cir
index 78431dc9682ade..d36b3910f08bd6 100644
--- a/clang/test/CIR/Lowering/switch.cir
+++ b/clang/test/CIR/Lowering/switch.cir
@@ -136,8 +136,6 @@ module {
   // CHECK: ^[[DIRECTLY_RET_BB]]:
   // CHECK:   llvm.return
   // CHECK: ^[[DEFAULT_BB:.+]]:
-  // CHECK:   llvm.br ^[[RET_BB:.+]]
-  // CHECK: ^[[RET_BB:.+]]:  // pred: ^[[DEFAULT_BB:.+]]
   // CHECK:   llvm.return
   // CHECK: }
 
@@ -174,17 +172,11 @@ module {
   // CHECK:      0: ^[[ZERO_BB:.+]]
   // CHECK:    ]
   // CHECK:  ^[[ZERO_BB]]:
-  // CHECK:    llvm.br ^[[ZERO_BB_SUCC:.+]]
-  // CHECK:  ^[[ZERO_BB_SUCC]]:  // pred: ^[[ZERO_BB:]]
   // CHECK:    llvm.cond_br {{%.*}}, ^[[DEFAULT_BB_PRED1:.+]], ^[[DEFAULT_BB_PRED12:.+]]
-  // CHECK:  ^[[DEFAULT_BB_PRED1]]:  // pred: ^[[ZERO_BB_SUCC]]
+  // CHECK:  ^[[DEFAULT_BB_PRED1]]:  // pred: ^[[ZERO_BB]]
   // CHECK:    llvm.br ^[[DEFAULT_BB]]
-  // CHECK:  ^[[DEFAULT_BB_PRED12]]:  // pred: ^[[ZERO_BB_SUCC]]
-  // CHECK:    llvm.br ^[[DEFAULT_BB_PRED1:.+]]
-  // CHECK:  ^[[DEFAULT_BB_PRED1]]:  // pred: ^[[DEFAULT_BB_PRED12]]
+  // CHECK:  ^[[DEFAULT_BB_PRED12]]:  // pred: ^[[ZERO_BB]]
   // CHECK:    llvm.br ^[[DEFAULT_BB]]
   // CHECK:  ^[[DEFAULT_BB]]:
-  // CHECK:    llvm.br ^[[RET_BB:.+]]
-  // CHECK:  ^[[RET_BB]]:  // pred: ^[[DEFAULT_BB]]
   // CHECK:    llvm.return
 }
diff --git a/clang/test/CIR/Transforms/fold-empty-branches.cir b/clang/test/CIR/Transforms/fold-empty-branches.cir
new file mode 100644
index 00000000000000..7e389cf69e566b
--- /dev/null
+++ b/clang/test/CIR/Transforms/fold-empty-branches.cir
@@ -0,0 +1,168 @@
+// RUN: cir-opt %s -cir-fold-empty-branches -o %t.cir
+// RUN: FileCheck --input-file=%t.cir %s
+
+!s32i = !cir.int<s, 32>
+
+module {
+  cir.func @chain(%arg0: !cir.bool) -> !s32i {
+    %0 = cir.const #cir.int<1> : !s32i
+    cir.brcond %arg0 ^bb1, ^bb4
+  ^bb1:
+    cir.br ^bb2
+  ^bb2:
+    cir.br ^bb3
+  ^bb3:
+    cir.return %0 : !s32i
+  ^bb4:
+    cir.return %0 : !s32i
+  }
+
+  // CHECK-LABEL: cir.func @chain
+  // CHECK:         %[[ONE:.*]] = cir.const #cir.int<1> : !s32i
+  // CHECK-NEXT:    cir.brcond %{{.*}} ^[[THEN:bb[0-9]+]], ^[[ELSE:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[THEN]]:
+  // CHECK-NEXT:    cir.return %[[ONE]] : !s32i
+  // CHECK-NEXT:  ^[[ELSE]]:
+  // CHECK-NEXT:    cir.return %[[ONE]] : !s32i
+  // CHECK-NEXT:  }
+
+  cir.func @forward_operands(%arg0: !cir.bool, %arg1: !s32i,
+                             %arg2: !s32i) -> !s32i {
+    cir.brcond %arg0 ^bb1, ^bb3
+  ^bb1:
+    cir.br ^bb2(%arg1 : !s32i)
+  ^bb2(%0: !s32i):
+    cir.return %0 : !s32i
+  ^bb3:
+    cir.return %arg2 : !s32i
+  }
+
+  // CHECK-LABEL: cir.func @forward_operands
+  // CHECK-SAME:      (%[[COND:.*]]: !cir.bool, %[[A:.*]]: !s32i, %[[B:.*]]: !s32i)
+  // CHECK-NEXT:    cir.brcond %[[COND]] ^[[THEN:bb[0-9]+]](%[[A]] : !s32i), ^[[ELSE:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[THEN]](%[[V:.*]]: !s32i):
+  // CHECK-NEXT:    cir.return %[[V]] : !s32i
+  // CHECK-NEXT:  ^[[ELSE]]:
+  // CHECK-NEXT:    cir.return %[[B]] : !s32i
+  // CHECK-NEXT:  }
+
+  cir.func @keep_shared_destination(%arg0: !cir.bool) {
+    cir.brcond %arg0 ^bb1, ^bb2
+  ^bb1:
+    cir.br ^bb3
+  ^bb2:
+    cir.br ^bb3
+  ^bb3:
+    cir.return
+  }
+
+  // CHECK-LABEL: cir.func @keep_shared_destination
+  // CHECK-NEXT:    cir.brcond %{{.*}} ^[[THEN:bb[0-9]+]], ^[[ELSE:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[THEN]]:
+  // CHECK-NEXT:    cir.br ^[[RET:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[ELSE]]:
+  // CHECK-NEXT:    cir.br ^[[RET]]
+  // CHECK-NEXT:  ^[[RET]]:
+  // CHECK-NEXT:    cir.return
+  // CHECK-NEXT:  }
+
+  cir.func @unreachable_empty_block() {
+    cir.return
+  ^bb1:
+    cir.br ^bb2
+  ^bb2:
+    cir.return
+  }
+
+  // CHECK-LABEL: cir.func @unreachable_empty_block
+  // CHECK-NEXT:    cir.return
+  // CHECK-NEXT:  ^bb1:
+  // CHECK-NEXT:    cir.return
+  // CHECK-NEXT:  }
+
+  cir.func @keep_entry_block() {
+    cir.br ^bb1
+  ^bb1:
+    cir.return
+  }
+
+  // CHECK-LABEL: cir.func @keep_entry_block
+  // CHECK-NEXT:    cir.br ^[[RET:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[RET]]:
+  // CHECK-NEXT:    cir.return
+  // CHECK-NEXT:  }
+
+  cir.func @keep_non_empty_block(%arg0: !cir.bool, %arg1: !s32i) -> !s32i {
+    cir.brcond %arg0 ^bb1, ^bb3
+  ^bb1:
+    %0 = cir.add %arg1, %arg1 : !s32i
+    cir.br ^bb2
+  ^bb2:
+    cir.return %0 : !s32i
+  ^bb3:
+    cir.return %arg1 : !s32i
+  }
+
+  // CHECK-LABEL: cir.func @keep_non_empty_block
+  // CHECK-NEXT:    cir.brcond %{{.*}} ^[[THEN:bb[0-9]+]], ^[[ELSE:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[THEN]]:
+  // CHECK-NEXT:    %[[SUM:.*]] = cir.add
+  // CHECK-NEXT:    cir.br ^[[RET:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[RET]]:
+  // CHECK-NEXT:    cir.return %[[SUM]] : !s32i
+  // CHECK-NEXT:  ^[[ELSE]]:
+  // CHECK-NEXT:    cir.return
+  // CHECK-NEXT:  }
+
+  cir.func @keep_block_with_arguments(%arg0: !cir.bool, %arg1: !s32i) {
+    cir.brcond %arg0 ^bb1(%arg1 : !s32i), ^bb3
+  ^bb1(%0: !s32i):
+    cir.br ^bb2
+  ^bb2:
+    cir.return
+  ^bb3:
+    cir.return
+  }
+
+  // CHECK-LABEL: cir.func @keep_block_with_arguments
+  // CHECK-NEXT:    cir.brcond %{{.*}} ^[[THEN:bb[0-9]+]](%{{.*}} : !s32i), ^[[ELSE:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[THEN]](%{{.*}}: !s32i):
+  // CHECK-NEXT:    cir.br ^[[RET:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[RET]]:
+  // CHECK-NEXT:    cir.return
+  // CHECK-NEXT:  ^[[ELSE]]:
+  // CHECK-NEXT:    cir.return
+  // CHECK-NEXT:  }
+
+  cir.func @keep_loop_back_edge(%arg0: !cir.bool) {
+    cir.brcond %arg0 ^bb1, ^bb2
+  ^bb1:
+    cir.br ^bb3 loop_id distinct[0]<>
+  ^bb2:
+    cir.return
+  ^bb3:
+    cir.return
+  }
+
+  // CHECK-LABEL: cir.func @keep_loop_back_edge
+  // CHECK-NEXT:    cir.brcond %{{.*}} ^[[EDGE:bb[0-9]+]], ^[[ELSE:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[EDGE]]:
+  // CHECK-NEXT:    cir.br ^[[RET:bb[0-9]+]] loop_id distinct[0]<>
+  // CHECK-NEXT:  ^[[ELSE]]:
+  // CHECK-NEXT:    cir.return
+  // CHECK-NEXT:  ^[[RET]]:
+  // CHECK-NEXT:    cir.return
+  // CHECK-NEXT:  }
+
+  cir.func @keep_self_loop() {
+    cir.br ^bb1
+  ^bb1:
+    cir.br ^bb1
+  }
+
+  // CHECK-LABEL: cir.func @keep_self_loop
+  // CHECK-NEXT:    cir.br ^[[LOOP:bb[0-9]+]]
+  // CHECK-NEXT:  ^[[LOOP]]:
+  // CHECK-NEXT:    cir.br ^[[LOOP]]
+  // CHECK-NEXT:  }
+}
diff --git a/clang/tools/cir-opt/cir-opt.cpp b/clang/tools/cir-opt/cir-opt.cpp
index 0a0c791ae494e3..92c607247f1e73 100644
--- a/clang/tools/cir-opt/cir-opt.cpp
+++ b/clang/tools/cir-opt/cir-opt.cpp
@@ -52,6 +52,9 @@ int main(int argc, char **argv) {
   ::mlir::registerPass([]() -> std::unique_ptr<::mlir::Pass> {
     return mlir::createCIRCanonicalizePass();
   });
+  ::mlir::registerPass([]() -> std::unique_ptr<::mlir::Pass> {
+    return mlir::createCIRFoldEmptyBranchesPass();
+  });
   ::mlir::registerPass([]() -> std::unique_ptr<::mlir::Pass> {
     return mlir::createCIRSimplifyPass();
   });

>From d8cefd40e37b2a766c7c694b5634eac7a711b3a0 Mon Sep 17 00:00:00 2001
From: Andy Kaylor <akaylor at nvidia.com>
Date: Thu, 5 Nov 2026 15:48:05 -0800
Subject: [PATCH 2/2] Address review feedback

---
 clang/lib/CIR/Dialect/Transforms/CIRFoldEmptyBranches.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/clang/lib/CIR/Dialect/Transforms/CIRFoldEmptyBranches.cpp b/clang/lib/CIR/Dialect/Transforms/CIRFoldEmptyBranches.cpp
index 4b5136a95d0147..7d8b99e02ee9f8 100644
--- a/clang/lib/CIR/Dialect/Transforms/CIRFoldEmptyBranches.cpp
+++ b/clang/lib/CIR/Dialect/Transforms/CIRFoldEmptyBranches.cpp
@@ -56,9 +56,10 @@ static bool foldEmptyBranch(Block &block) {
   if (dest->getSinglePredecessor() != &block)
     return false;
 
-  for (Block *pred : block.getPredecessors())
-    if (!isa<BranchOpInterface>(pred->getTerminator()))
-      return false;
+  if (!llvm::all_of(block.getPredecessors(), [](Block *pred) {
+        return isa<BranchOpInterface>(pred->getTerminator());
+      }))
+    return false;
 
   SmallVector<Value> operands(br.getDestOperands());
   for (BlockOperand &use : llvm::make_early_inc_range(block.getUses())) {



More information about the cfe-commits mailing list