Fixed danmar#5839 (False positive: Function can be const, if this is passed to functor)

danmar · danmar · commit 4d22ada078d2 · 2016-09-04T16:36:04.000+02:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -1978,7 +1978,10 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, bool&
                 memberAccessed = true;
             }
             // Member variable given as parameter
-            for (const Token* tok2 = tok1->tokAt(2); tok2 && tok2 != tok1->next()->link(); tok2 = tok2->next()) {
+            const Token *lpar = tok1->next();
+            if (Token::simpleMatch(lpar, "( ) ("))
+                lpar = lpar->tokAt(2);
+            for (const Token* tok2 = lpar->next(); tok2 && tok2 != tok1->next()->link(); tok2 = tok2->next()) {
                 if (tok2->str() == "(")
                     tok2 = tok2->link();
                 else if (tok2->isName() && isMemberVar(scope, tok2)) {
diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -5135,6 +5135,17 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "};");
         ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'Foo::foo' can be static.\n", errout.str());
+
+        checkConst("struct A;\n" // #5839 - operator()
+                   "struct B {\n"
+                   "    void operator()(A *a);\n"
+                   "};\n"
+                   "struct A {\n"
+                   "    void dostuff() {\n"
+                   "        B()(this);\n"
+                   "    }\n"
+                   "};");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void assigningPointerToPointerIsNotAConstOperation() {
