From 8118e4755a5ae745cadc18595328b90da7633780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Thu, 2 Dec 2010 20:08:05 +0100
Subject: [PATCH] Fixed #2263 (False positive: variable assigned value that is
 never used)

---
 lib/checkother.cpp     |  4 ++++
 test/testunusedvar.cpp | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index e475adf8c..6e0487285 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -1707,7 +1707,11 @@ void CheckOther::functionVariableUsage()
 
             // function
             else if (Token::Match(tok, " %var% ("))
+            {
                 variables.read(tok->varId());
+                if (Token::Match(tok->tokAt(2), "%var% ="))
+                    variables.read(tok->tokAt(2)->varId());
+            }
 
             else if (Token::Match(tok, " %var% ."))
                 variables.use(tok->varId());   // use = read + write
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
index b8f852fb7..4de518c67 100644
--- a/test/testunusedvar.cpp
+++ b/test/testunusedvar.cpp
@@ -102,7 +102,8 @@ private:
         TEST_CASE(localvarIfElse);      // return tmp1 ? tmp2 : tmp3;
         TEST_CASE(localvarOpAssign);    // a |= b;
         TEST_CASE(localvarFor);         // for ( ; var; )
-        TEST_CASE(localvarShift);       // 1 >> var
+        TEST_CASE(localvarShift1);      // 1 >> var
+        TEST_CASE(localvarShift2);      // x = x >> 1
         TEST_CASE(localvarCast);
         TEST_CASE(localvarClass);
         TEST_CASE(localvarUnused);
@@ -2327,7 +2328,7 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
-    void localvarShift()
+    void localvarShift1()
     {
         functionVariableUsage("int foo()\n"
                               "{\n"
@@ -2337,6 +2338,16 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
+    void localvarShift2()
+    {
+        functionVariableUsage("int foo()\n"
+                              "{\n"
+                              "    int var = 1;\n"
+                              "    while (var = var >> 1) { }\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void localvarCast()
     {
         functionVariableUsage("int foo()\n"