Skip to content

Fix #11872 FN unusedVariable with multidimensional array #5334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 2 commits into from
Aug 20, 2023
Merged

Fix #11872 FN unusedVariable with multidimensional array #5334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b29e197
Fix #11872 FN unusedVariable with multidimensional array
chrchr-github Aug 16, 2023
6e75ed5
Fix failing test
chrchr-github Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions lib/checkunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
else if (i->isArray() && i->nameToken()->previous()->str() == "&")
type = Variables::referenceArray;
else if (i->isArray())
type = (i->dimensions().size() == 1U) ? Variables::array : Variables::pointerArray;
type = Variables::array;
else if (i->isReference() && !(i->valueType() && i->valueType()->type == ValueType::UNKNOWN_TYPE && Token::simpleMatch(i->typeStartToken(), "auto")))
type = Variables::reference;
else if (i->nameToken()->previous()->str() == "*" && i->nameToken()->strAt(-2) == "*")
Expand Down Expand Up @@ -1069,13 +1069,15 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
} else if (Token::Match(tok, "[(,] & %var% [,)]")) {
variables.eraseAll(tok->tokAt(2)->varId());
} else if (Token::Match(tok, "[(,] (") &&
Token::Match(tok->next()->link(), ") %var% [,)]")) {
Token::Match(tok->next()->link(), ") %var% [,)[]")) {
variables.use(tok->next()->link()->next()->varId(), tok); // use = read + write
} else if (Token::Match(tok, "[(,] *| %var% =")) {
tok = tok->next();
if (tok->str() == "*")
tok = tok->next();
variables.use(tok->varId(), tok);
} else if (Token::Match(tok, "[(,] *| *| %var%")) {
const Token* vartok = tok->next();
while (vartok->str() == "*")
vartok = vartok->next();
if (!(vartok->variable() && vartok == vartok->variable()->nameToken()) &&
!(tok->str() == "(" && !Token::Match(tok->previous(), "%name%")))
variables.use(vartok->varId(), vartok);
}

// function
Expand Down
2 changes: 0 additions & 2 deletions test/cfg/std.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4181,7 +4181,6 @@ void uninitvar_tolower(int character)
// cppcheck-suppress uninitvar
(void)tolower(c1);

// cppcheck-suppress unassignedVariable
int c2;
// cppcheck-suppress constVariablePointer
int *pc=&c2;
Expand All @@ -4203,7 +4202,6 @@ void uninitvar_toupper(int character)
// cppcheck-suppress uninitvar
(void)toupper(c1);

// cppcheck-suppress unassignedVariable
int c2;
// cppcheck-suppress constVariablePointer
int *pc=&c2;
Expand Down
17 changes: 17 additions & 0 deletions test/testunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6041,6 +6041,23 @@ class TestUnusedVar : public TestFixture {
" dostuff(*p);\n"
"}");
ASSERT_EQUALS("", errout.str());

functionVariableUsage("int foo() {\n"
" int p[5];\n"
" dostuff(*p);\n"
"}");
ASSERT_EQUALS("", errout.str());

functionVariableUsage("int foo() {\n"
" int p[5][5][5];\n"
" dostuff(**p);\n"
"}");
ASSERT_EQUALS("", errout.str());

functionVariableUsage("void f() {\n" // #11872
" char v[1][2];\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style) Unused variable: v\n", errout.str());
}

void localvarstring1() { // ticket #1597
Expand Down