AssignIf: Improved handling of function calls

danmar · danmar · commit fd26bad6fafa · 2013-08-13T14:08:54.000+02:00
diff --git a/lib/checkassignif.cpp b/lib/checkassignif.cpp
@@ -99,9 +99,22 @@ bool CheckAssignIf::assignIfParseScope(const Token * const assignTok,
             }
             return true;
         }
-        if (Token::Match(tok2, "[(,] &| %varid% [,)]", varid))
-            // TODO: don't bailout if variable is passed by value
-            return true;
+        if (Token::Match(tok2, "[(,] &| %varid% [,)]", varid)) {
+            unsigned int argumentNumber = 0;
+            const Token *ftok;
+            for (ftok = tok2; ftok && ftok->str() != "("; ftok = ftok->previous()) {
+                if (ftok->str() == ")")
+                    ftok = ftok->link();
+                else if (ftok->str() == ",")
+                    argumentNumber++;
+            }
+            ftok = ftok ? ftok->previous() : NULL;
+            if (!(ftok && ftok->function()))
+                return true;
+            const Variable *par = ftok->function()->getArgumentVar(argumentNumber);
+            if (par == NULL || par->isReference() || par->isPointer())
+                return true;
+        }
         if (tok2->str() == "}")
             return false;
         if (Token::Match(tok2, "break|continue|return"))
diff --git a/test/testassignif.cpp b/test/testassignif.cpp
@@ -169,10 +169,10 @@ class TestAssignIf : public TestFixture {
         check("void do_something(int);\n"
               "void f(int x) {\n"
               "    int y = x & 7;\n"
-              "    do_something(y);\n" // passing variable by value => error
+              "    do_something(y);\n"
               "    if (y==8);\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false.\n", errout.str());
 
         check("void f(int x) {\n"
               "    extern int y; y = x & 7;\n"
