walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed #2004 (False positive in 'variable assigned a value but is never used' check)

This commit is contained in:
Daniel Marjamäki 2010-08-31 20:58:37 +02:00
parent 1d78b5072d
commit 8ff1e71b22
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkother.cpp
View File

@ -1634,7 +1634,6 @@ void CheckOther::functionVariableUsage()
else else
{ {
Variables::VariableUsage *var = variables.find(varid1); Variables::VariableUsage *var = variables.find(varid1);
if (var && var->_type == Variables::reference) if (var && var->_type == Variables::reference)
{ {
variables.writeAliases(varid1); variables.writeAliases(varid1);
@ -1642,6 +1641,13 @@ void CheckOther::functionVariableUsage()
} }
else else
variables.write(varid1); variables.write(varid1);
Variables::VariableUsage *var2 = variables.find(tok->varId());
if (var2 && var2->_type == Variables::reference)
{
variables.writeAliases(tok->varId());
variables.read(tok->varId());
}
} }
const Token *equal = tok->next(); const Token *equal = tok->next();

12
test/testunusedvar.cpp
View File

@ -81,6 +81,7 @@ private:
TEST_CASE(localvaralias7); // ticket #1732 TEST_CASE(localvaralias7); // ticket #1732
TEST_CASE(localvaralias8); TEST_CASE(localvaralias8);
TEST_CASE(localvaralias9); // ticket #1996 TEST_CASE(localvaralias9); // ticket #1996
TEST_CASE(localvaralias10); // ticket #2004
TEST_CASE(localvarasm); TEST_CASE(localvarasm);
TEST_CASE(localvarstatic); TEST_CASE(localvarstatic);
@ -2146,6 +2147,17 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void localvaralias10() // ticket 2004
{
functionVariableUsage("void foo(Foo &foo)\n"
"{\n"
" Foo &ref = foo;\n"
" int *x = &ref.x();\n"
" *x = 0;\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void localvarasm() void localvarasm()
{ {
functionVariableUsage("void foo(int &b)\n" functionVariableUsage("void foo(int &b)\n"