From 145449b1e420787bb99721a429341fa6be3adfb6 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 3 Jul 2022 16:10:23 +0200
Subject: Vendor import of llvm-project main
 llvmorg-15-init-15358-g53dc0f107877.

---
 clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp')

diff --git a/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp b/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp
index 3ad2ed640cc1..fe9907a7c99b 100644
--- a/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp
+++ b/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp
@@ -33,11 +33,13 @@ buildStmtToBasicBlockMap(const CFG &Cfg) {
 
     for (const CFGElement &Element : *Block) {
       auto Stmt = Element.getAs<CFGStmt>();
-      if (!Stmt.hasValue())
+      if (!Stmt)
         continue;
 
       StmtToBlock[Stmt.getValue().getStmt()] = Block;
     }
+    if (const Stmt *TerminatorStmt = Block->getTerminatorStmt())
+      StmtToBlock[TerminatorStmt] = Block;
   }
   return StmtToBlock;
 }
-- 
cgit v1.2.3