[clang] [Clang] Do not check result of getTerminator. NFC. (PR #232736)

Jay Foad via cfe-commits cfe-commits at lists.llvm.org
Fri Oct 16 06:08:37 PDT 2026


https://github.com/jayfoad created https://github.com/llvm/llvm-project/pull/232736

Since #189416 BasicBlock::getTerminator cannot return nullptr.


>From 0a6ecffbcbc46ff4bceb80b9d2063a1b3db575c7 Mon Sep 17 00:00:00 2001
From: Jay Foad <jay.foad at amd.com>
Date: Fri, 16 Oct 2026 14:07:08 +0100
Subject: [PATCH] [Clang] Do not check result of getTerminator. NFC.

Since #189416 BasicBlock::getTerminator cannot return nullptr.
---
 clang/lib/CodeGen/CGDecl.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
index 019b7ac22272e6..8862f573014126 100644
--- a/clang/lib/CodeGen/CGDecl.cpp
+++ b/clang/lib/CodeGen/CGDecl.cpp
@@ -1664,11 +1664,9 @@ CodeGenFunction::EmitAutoVarAlloca(const VarDecl &D) {
           const auto *Vars = Bypasses.getBypassedVarsForSource(FG.Source);
           if (!Vars || !Vars->contains(&D))
             continue;
-          if (llvm::Instruction *Term = FG.Block->getTerminator()) {
-            llvm::IRBuilderBase::InsertPointGuard IPG(Builder);
-            Builder.SetInsertPoint(Term);
-            emitZeroOrPatternForAutoVarInit(Ty, D, address);
-          }
+          llvm::IRBuilderBase::InsertPointGuard IPG(Builder);
+          Builder.SetInsertPoint(FG.Block->getTerminator());
+          emitZeroOrPatternForAutoVarInit(Ty, D, address);
         }
       } else {
         // A computed goto can jump anywhere, so we can't identify the jumps



More information about the cfe-commits mailing list