From 44887df04fb3e88d5ba86f2fa2940bc31e4a0355 Mon Sep 17 00:00:00 2001
From: PKEuS <philipp.kloke@web.de>
Date: Fri, 15 Feb 2013 09:40:34 -0800
Subject: [PATCH] Fixed false positive redundantAssignment when calling
 function in assignment (#4513)

---
 lib/checkother.cpp |  8 ++++++-
 test/testother.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index 7530e6908..909631a35 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -663,7 +663,7 @@ void CheckOther::sizeofForPointerError(const Token *tok, const std::string &varn
 
 static bool nonLocal(const Variable* var)
 {
-    return (!var->isLocal() && !var->isArgument()) || var->isStatic() || var->isReference();
+    return !var || (!var->isLocal() && !var->isArgument()) || var->isStatic() || var->isReference();
 }
 
 static void eraseNotLocalArg(std::map<unsigned int, const Token*>& container, const SymbolDatabase* symbolDatabase)
@@ -717,6 +717,12 @@ void CheckOther::checkRedundantAssignment()
                                 break;
                             else if (tok2->varId() == tok->varId())
                                 error = false;
+                            else if (Token::Match(tok2, "%var% (") && nonLocal(tok->variable())) { // Called function might use the variable
+                                const Function* func = symbolDatabase->findFunction(tok2);
+                                const Variable* var = tok->variable();
+                                if (!var || var->isGlobal() || var->isReference() || ((!func || func->functionScope->functionOf) && tok2->strAt(-1) != ".")) // Global variable, or member function
+                                    error = false;
+                            }
                         }
                         if (error) {
                             if (scope->type == Scope::eSwitch && Token::findmatch(it->second, "default|case", tok))
diff --git a/test/testother.cpp b/test/testother.cpp
index 2a2091fb1..9fe4ae570 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -6822,7 +6822,7 @@ private:
         check("void f() {\n"
               "    Foo& bar = foo();\n"
               "    bar = x;\n"
-              "    bar = y();\n"
+              "    bar = y;\n"
               "}");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance, inconclusive) Variable 'bar' is reassigned a value before the old one has been used if variable is no semaphore variable.\n", errout.str());
 
@@ -6889,6 +6889,57 @@ private:
               "    i = 2;\n"
               "}");
         ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5]: (performance) Variable 'i' is reassigned a value before the old one has been used.\n", errout.str());
+
+        // #4513
+        check("int x;\n"
+              "int g() {\n"
+              "    return x*x;\n"
+              "}\n"
+              "void f() {\n"
+              "    x = 2;\n"
+              "    x = g();\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
+        check("int g() {\n"
+              "    return x*x;\n"
+              "}\n"
+              "void f(int x) {\n"
+              "    x = 2;\n"
+              "    x = g();\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:6]: (performance) Variable 'x' is reassigned a value before the old one has been used.\n", errout.str());
+
+        check("void f() {\n"
+              "    Foo& bar = foo();\n"
+              "    bar = x;\n"
+              "    bar = y();\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
+        check("class C {\n"
+              "    int x;\n"
+              "    void g() { return x*x; }\n"
+              "    void f();\n"
+              "};\n"
+              "\n"
+              "void C::f() {\n"
+              "    x = 2;\n"
+              "    x = g();\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
+        check("class C {\n"
+              "    int x;\n"
+              "    void g() { return x*x; }\n"
+              "    void f();\n"
+              "};\n"
+              "\n"
+              "void C::f(Foo z) {\n"
+              "    x = 2;\n"
+              "    x = z.g();\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:9]: (performance, inconclusive) Variable 'x' is reassigned a value before the old one has been used if variable is no semaphore variable.\n", errout.str());
     }
 
     void redundantMemWrite() {