1 files changed, 3 insertions, 6 deletions
diff --git a/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp b/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp
index c0b8119..3a362d49 100644
--- a/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp
+++ b/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp
@@ -31,13 +31,10 @@ buildStmtToBasicBlockMap(const CFG &Cfg) {
     if (Block == nullptr)
       continue;
 
-    for (const CFGElement &Element : *Block) {
-      auto Stmt = Element.getAs<CFGStmt>();
-      if (!Stmt.hasValue())
-        continue;
+    for (const CFGElement &Element : *Block)
+      if (auto Stmt = Element.getAs<CFGStmt>())
+        StmtToBlock[Stmt->getStmt()] = Block;
 
-      StmtToBlock[Stmt.getValue().getStmt()] = Block;
-    }
     if (const Stmt *TerminatorStmt = Block->getTerminatorStmt())
       StmtToBlock[TerminatorStmt] = Block;
   }