remove redundant reference check and add one more test

Author: BaLiKfromUA

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

@@ -586,18 +586,14 @@ void handleConstMemberCall(const CallExpr *CE,
     if (DirectCallee == nullptr)
       return;
 
-    bool isReference =
-        DirectCallee->getReturnType().getTypePtr()->isReferenceType();
-    if (isReference) {
-      StorageLocation &Loc =
-          State.Lattice.getOrCreateConstMethodReturnStorageLocation(
-              *RecordLoc, DirectCallee, State.Env, [&](StorageLocation &Loc) {
-                // no-op
-              });
+    StorageLocation &Loc =
+        State.Lattice.getOrCreateConstMethodReturnStorageLocation(
+            *RecordLoc, DirectCallee, State.Env, [&](StorageLocation &Loc) {
+              // no-op
+          });
 
-      State.Env.setStorageLocation(*CE, Loc);
-      return;
-    }
+    State.Env.setStorageLocation(*CE, Loc);
+    return;
   }
 
   // Cache if the const method returns a boolean or pointer type.

clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp

@@ -4010,7 +4010,7 @@ TEST_P(UncheckedOptionalAccessTest,
 
 TEST_P(
     UncheckedOptionalAccessTest,
-    ConstRefAccessorToOptionalViaNonConstRefAccessorToHoldingObjectWithModAfterCheck) {
+    ConstRefAccessorToOptionalViaConstRefAccessorToHoldingObjectWithModAfterCheck) {
   ExpectDiagnosticsFor(R"cc(
     #include "unchecked_optional_access_test.h"
 
@@ -4027,7 +4027,7 @@ TEST_P(
 
         A& getA() { return a; }
 
-        void clear() { a = A{}; };
+        void clear() { a = A{}; }
 
       private:
         A a;
@@ -4049,6 +4049,41 @@ TEST_P(
   )cc");
 }
 
+
+TEST_P(
+  UncheckedOptionalAccessTest,
+  ConstRefAccessorToOptionalViaConstRefAccessorToHoldingObjectWithAnotherConstCallAfterCheck) {
+    ExpectDiagnosticsFor(R"cc(
+      #include "unchecked_optional_access_test.h"
+  
+      class A {
+        public:
+          const $ns::$optional<int>& get() const { return x; }
+        private:
+          $ns::$optional<int> x;
+      };
+  
+      class B {
+        public:
+          const A& getA() const { return a; }
+  
+          void callWithoutChanges() const { 
+            // no-op 
+          }
+  
+        private:
+          A a;
+      };
+  
+      void target(B& b) {  
+        if (b.getA().get().has_value()) {
+          b.callWithoutChanges(); // calling const method which cannot change A
+          b.getA().get().value();
+        }
+      }
+    )cc");
+}
+
 // FIXME: Add support for:
 // - constructors (copy, move)
 // - assignment operators (default, copy, move)