Fix #11618 FP functionConst with call to static function (danmar#4898)

chrchr-github · web-flow · commit 3d965b5b81fa · 2023-03-20T19:29:49.000+01:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -2313,7 +2313,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, bool&
             mayModifyArgs = false;
             for (nonneg int argIndex = 0; argIndex < argMax; ++argIndex) {
                 const Variable* const argVar = f->getArgumentVar(argIndex);
-                if (!argVar || !argVar->valueType() || ((argVar->valueType()->pointer || argVar->valueType()->reference != Reference::None) && !argVar->isConst())) {
+                if (!argVar || ((argVar->isArrayOrPointer() || argVar->isReference()) && !argVar->isConst())) {
                     mayModifyArgs = true;
                     break;
                 }
diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -197,6 +197,7 @@ class TestClass : public TestFixture {
         TEST_CASE(const81); // ticket #11330
         TEST_CASE(const82); // ticket #11513
         TEST_CASE(const83);
+        TEST_CASE(const84);
 
         TEST_CASE(const_handleDefaultParameters);
         TEST_CASE(const_passThisToMemberOfOtherClass);
@@ -6360,6 +6361,19 @@ class TestClass : public TestFixture {
         ASSERT_EQUALS("", errout.str());
     }
 
+    void const84() { // #11618
+        checkConst("struct S {\n"
+                   "    int a[2], b[2];\n"
+                   "    void f() { f(a, b); }\n"
+                   "    static void f(const int p[2], int q[2]);\n"
+                   "};\n"
+                   "void S::f(const int p[2], int q[2]) {\n"
+                   "    q[0] = p[0];\n"
+                   "    q[1] = p[1];\n"
+                   "}\n");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void const_handleDefaultParameters() {
         checkConst("struct Foo {\n"
                    "    void foo1(int i, int j = 0) {\n"

Original file line number	Diff line number	Diff line change
`@@ -2313,7 +2313,7 @@ bool CheckClass::checkConstFunc(const Scope scope, const Function func, bool&`
`2313`	`2313`	`mayModifyArgs = false;`
`2314`	`2314`	`for (nonneg int argIndex = 0; argIndex < argMax; ++argIndex) {`
`2315`	`2315`	`const Variable* const argVar = f->getArgumentVar(argIndex);`
`2316`		`- if (!argVar \|\| !argVar->valueType() \|\| ((argVar->valueType()->pointer \|\| argVar->valueType()->reference != Reference::None) && !argVar->isConst())) {`
	`2316`	`+ if (!argVar \|\| ((argVar->isArrayOrPointer() \|\| argVar->isReference()) && !argVar->isConst())) {`
`2317`	`2317`	`mayModifyArgs = true;`
`2318`	`2318`	`break;`
`2319`	`2319`	`}`