rebase

Created using spr 1.3.7

Author: fmayer

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

@@ -844,15 +844,26 @@ static void transferPointerToBoolean(const ImplicitCastExpr *Expr,
           dyn_cast_or_null<BoolValue>(State.Env.getValue(*Expr->getSubExpr())))
     State.Env.setValue(*Expr, *SubExprVal);
 }
-static void handleConstStatusOrAccessorMemberCall(
+
+static void transferStatusOrReturningCall(const CallExpr *Expr,
+                                          LatticeTransferState &State) {
+  RecordStorageLocation *StatusOrLoc =
+      Expr->isPRValue() ? &State.Env.getResultObjectLocation(*Expr)
+                        : State.Env.get<RecordStorageLocation>(*Expr);
+  if (StatusOrLoc != nullptr &&
+      State.Env.getValue(locForOk(locForStatus(*StatusOrLoc))) == nullptr)
+    initializeStatusOr(*StatusOrLoc, State.Env);
+}
+
+static bool doHandleConstStatusOrAccessorMemberCall(
     const CallExpr *Expr, RecordStorageLocation *RecordLoc,
     const MatchFinder::MatchResult &Result, LatticeTransferState &State) {
   assert(isStatusOrType(Expr->getType()));
   if (RecordLoc == nullptr)
-    return;
+    return false;
   const FunctionDecl *DirectCallee = Expr->getDirectCallee();
   if (DirectCallee == nullptr)
-    return;
+    return false;
   StorageLocation &Loc =
       State.Lattice.getOrCreateConstMethodReturnStorageLocation(
           *RecordLoc, DirectCallee, State.Env, [&](StorageLocation &Loc) {
@@ -864,8 +875,15 @@ static void handleConstStatusOrAccessorMemberCall(
   } else {
     State.Env.setStorageLocation(*Expr, Loc);
   }
+  return true;
 }
 
+static void handleConstStatusOrAccessorMemberCall(
+    const CallExpr *Expr, RecordStorageLocation *RecordLoc,
+    const MatchFinder::MatchResult &Result, LatticeTransferState &State) {
+  if (!doHandleConstStatusOrAccessorMemberCall(Expr, RecordLoc, Result, State))
+    transferStatusOrReturningCall(Expr, State);
+}
 static void handleConstStatusOrPointerAccessorMemberCall(
     const CallExpr *Expr, RecordStorageLocation *RecordLoc,
     const MatchFinder::MatchResult &Result, LatticeTransferState &State) {
@@ -907,16 +925,6 @@ static void transferConstStatusOrPointerAccessorMemberOperatorCall(
   handleConstStatusOrPointerAccessorMemberCall(Expr, RecordLoc, Result, State);
 }
 
-static void transferStatusOrReturningCall(const CallExpr *Expr,
-                                          LatticeTransferState &State) {
-  RecordStorageLocation *StatusOrLoc =
-      Expr->isPRValue() ? &State.Env.getResultObjectLocation(*Expr)
-                        : State.Env.get<RecordStorageLocation>(*Expr);
-  if (StatusOrLoc != nullptr &&
-      State.Env.getValue(locForOk(locForStatus(*StatusOrLoc))) == nullptr)
-    initializeStatusOr(*StatusOrLoc, State.Env);
-}
-
 static void handleNonConstMemberCall(const CallExpr *Expr,
                                      RecordStorageLocation *RecordLoc,
                                      const MatchFinder::MatchResult &Result,

clang/unittests/Analysis/FlowSensitive/UncheckedStatusOrAccessModelTestFixture.cpp

@@ -3478,7 +3478,7 @@ TEST_P(UncheckedStatusOrAccessModelTest, AccessorCall) {
         }
       )cc");
 
-  // Calls nonconst method inbetween.
+  // Calls nonconst method in between.
   ExpectDiagnosticsFor(
       R"cc(
 #include "unchecked_statusor_access_test_defs.h"
@@ -3499,7 +3499,7 @@ TEST_P(UncheckedStatusOrAccessModelTest, AccessorCall) {
         }
       )cc");
 
-  // Calls nonconst operator inbetween.
+  // Calls nonconst operator in between.
   ExpectDiagnosticsFor(
       R"cc(
 #include "unchecked_statusor_access_test_defs.h"