Fix #13302 false negative: noConstructor (regression)

danmar · Nov 12, 2024 · 21d0bad · 21d0bad
1 parent c36c8a6
commit 21d0bad
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -2550,7 +2550,7 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
     }
 
     if (const Variable* var = tok->variable()) {
-        if (tok == var->nameToken() && (!var->isReference() || var->isConst()) && (!var->isClass() || (var->valueType() && var->valueType()->container))) // const ref or passed to (copy) ctor
+        if (tok == var->nameToken() && (!var->isReference() || (var->isConst() && var->type() == tok1->type())) && (!var->isClass() || (var->valueType() && var->valueType()->container))) // const ref or passed to (copy) ctor
             return false;
     }
 

diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
@@ -75,6 +75,7 @@ class TestConstructors : public TestFixture {
         TEST_CASE(simple15); // #8942 multiple arguments, decltype
         TEST_CASE(simple16); // copy members with c++11 init
         TEST_CASE(simple17); // #10360
+        TEST_CASE(simple18);
 
         TEST_CASE(noConstructor1);
         TEST_CASE(noConstructor2);
@@ -510,6 +511,23 @@ class TestConstructors : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void simple15() { // #8942
+        check("class A\n"
+              "{\n"
+              "public:\n"
+              "  int member;\n"
+              "};\n"
+              "class B\n"
+              "{\n"
+              "public:\n"
+              "  B(const decltype(A::member)& x, const decltype(A::member)& y) : x(x), y(y) {}\n"
+              "private:\n"
+              "  const decltype(A::member)& x;\n"
+              "  const decltype(A::member)& y;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void simple16() {
         check("struct S {\n"
               "    int i{};\n"
@@ -554,21 +572,13 @@ class TestConstructors : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
-    void simple15() { // #8942
-        check("class A\n"
-              "{\n"
-              "public:\n"
-              "  int member;\n"
-              "};\n"
-              "class B\n"
-              "{\n"
-              "public:\n"
-              "  B(const decltype(A::member)& x, const decltype(A::member)& y) : x(x), y(y) {}\n"
-              "private:\n"
-              "  const decltype(A::member)& x;\n"
-              "  const decltype(A::member)& y;\n"
-              "};\n");
-        ASSERT_EQUALS("", errout_str());
+    void simple18() { // #13302
+        check("struct S {};\n"
+              "class C1 { S& r; };\n"
+              "class C2 { S* p; };\n");
+        ASSERT_EQUALS("[test.cpp:2]: (style) The class 'C1' does not declare a constructor although it has private member variables which likely require initialization.\n"
+                      "[test.cpp:3]: (style) The class 'C2' does not declare a constructor although it has private member variables which likely require initialization.\n",
+                      errout_str());
     }
 
     void noConstructor1() {