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

Fixed #4020 (false positive: (style) Variable 'dst' is assigned a value that is never used)

This commit is contained in:
Daniel Marjamäki 2012-08-22 19:47:46 +02:00
parent 4fb464982c
commit f133c9e8ec
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkunusedvar.cpp
View File

@ -356,8 +356,11 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
if (var1) { if (var1) {
// jump behind '=' // jump behind '='
tok = tok->next(); tok = tok->next();
while (tok->str() != "=") while (tok->str() != "=") {
if (tok->varId())
variables.read(tok->varId());
tok = tok->next(); tok = tok->next();
}
tok = tok->next(); tok = tok->next();
if (Token::Match(tok, "&| %var%") || if (Token::Match(tok, "&| %var%") ||
@ -479,6 +482,8 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
variables.readAliases(varid2); variables.readAliases(varid2);
else else
variables.read(varid2); variables.read(varid2);
} else {
variables.read(varid2);
} }
} }
} else if (var1->_type == Variables::reference) { } else if (var1->_type == Variables::reference) {

10
test/testunusedvar.cpp
View File

@ -90,6 +90,7 @@ private:
TEST_CASE(localvar42); // ticket #3603 TEST_CASE(localvar42); // ticket #3603
TEST_CASE(localvar43); // ticket #3742 TEST_CASE(localvar43); // ticket #3742
TEST_CASE(localvar44); // ticket #3602 TEST_CASE(localvar44); // ticket #3602
TEST_CASE(localvar45); // ticket #4020
TEST_CASE(localvaralias1); TEST_CASE(localvaralias1);
TEST_CASE(localvaralias2); // ticket #1637 TEST_CASE(localvaralias2); // ticket #1637
TEST_CASE(localvaralias3); // ticket #1639 TEST_CASE(localvaralias3); // ticket #1639
@ -1519,6 +1520,15 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void localvar45() { // #4020 - FP
functionVariableUsage("void func() {\n"
" int *sp_mem[2] = { 0x00, 0x00 };\n"
" int src = 1, dst = 2;\n"
" sp_mem[(dst + i)][3] = src;\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void localvaralias1() { void localvaralias1() {
functionVariableUsage("void foo()\n" functionVariableUsage("void foo()\n"
"{\n" "{\n"