Fix

Author: zeyi2

clang/include/clang/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.h

@@ -48,10 +48,6 @@ struct UncheckedOptionalAccessModelOptions {
   bool IgnoreSmartPointerDereference = false;
 
   /// In generating diagnostics, ignore calls to `optional::value()`.
-  ///
-  /// Projects that intentionally use `value()` as a guarded access pattern may
-  /// set this to true to suppress diagnostics for `value()` while continuing to
-  /// diagnose UB-prone operator accesses (`operator*`, `operator->`).
   bool IgnoreValueCalls = false;
 };
 

clang/lib/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.cpp

@@ -1155,26 +1155,30 @@ auto buildDiagnoseMatchSwitch(
   // that avoid it through memoization.
   const auto IgnorableOptional = ignorableOptional(Options);
 
-  auto Builder = CFGMatchSwitchBuilder<
-                     const Environment,
-                     llvm::SmallVector<UncheckedOptionalAccessDiagnostic>>()
-                     .CaseOfCFGStmt<CallExpr>(
-                         valueOperatorCall(IgnorableOptional),
-                         [](const CallExpr *E, const MatchFinder::MatchResult &,
-                            const Environment &Env) {
-                           return diagnoseUnwrapCall(E->getArg(0), Env);
-                         });
-
-  if (!Options.IgnoreValueCalls) {
-    return std::move(Builder)
-        .CaseOfCFGStmt<CXXMemberCallExpr>(
-            valueCall(IgnorableOptional),
-            [](const CXXMemberCallExpr *E, const MatchFinder::MatchResult &,
-               const Environment &Env) {
-              return diagnoseUnwrapCall(E->getImplicitObjectArgument(), Env);
-            })
-        .Build();
-  }
+  auto DiagBuilder =
+      CFGMatchSwitchBuilder<
+          const Environment,
+          llvm::SmallVector<UncheckedOptionalAccessDiagnostic>>()
+          // optional::operator*, optional::operator->
+          .CaseOfCFGStmt<CallExpr>(
+              valueOperatorCall(IgnorableOptional),
+              [](const CallExpr *E, const MatchFinder::MatchResult &,
+                 const Environment &Env) {
+                return diagnoseUnwrapCall(E->getArg(0), Env);
+              });
+
+  auto Builder = Options.IgnoreValueCalls
+                     ? std::move(DiagBuilder)
+                     : std::move(DiagBuilder)
+                           // optional::value
+                           .CaseOfCFGStmt<CXXMemberCallExpr>(
+                               valueCall(IgnorableOptional),
+                               [](const CXXMemberCallExpr *E,
+                                  const MatchFinder::MatchResult &,
+                                  const Environment &Env) {
+                                 return diagnoseUnwrapCall(
+                                     E->getImplicitObjectArgument(), Env);
+                               });
 
   return std::move(Builder).Build();
 }