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

Fix #11301 debug: constStatementError not handled. (#4463) 

* Fix #11301 debug: constStatementError not handled.

* Use function
This commit is contained in:
chrchr-github 2022-09-14 23:57:02 +02:00 committed by GitHub
parent 266174ddc4
commit d1386a842a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/checkother.cpp
View File

@ -1777,6 +1777,10 @@ static bool isBracketAccess(const Token* tok)
return tok->variable()->nameToken() != tok; return tok->variable()->nameToken() != tok;
} }
static bool isConstant(const Token* tok) {
return Token::Match(tok, "%bool%|%num%|%str%|%char%|nullptr|NULL");
}
static bool isConstStatement(const Token *tok, bool cpp) static bool isConstStatement(const Token *tok, bool cpp)
{ {
if (!tok) if (!tok)
@ -1785,7 +1789,7 @@ static bool isConstStatement(const Token *tok, bool cpp)
return false; return false;
if (tok->varId() != 0) if (tok->varId() != 0)
return true; return true;
if (Token::Match(tok, "%bool%|%num%|%str%|%char%|nullptr|NULL")) if (isConstant(tok))
return true; return true;
if (Token::Match(tok, "*|&|&&") && if (Token::Match(tok, "*|&|&&") &&
(Token::Match(tok->previous(), "::|.|const|volatile|restrict") || isVarDeclOp(tok))) (Token::Match(tok->previous(), "::|.|const|volatile|restrict") || isVarDeclOp(tok)))
@ -1944,7 +1948,7 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
msg = "Found suspicious operator '" + tok->str() + "', result is not used."; msg = "Found suspicious operator '" + tok->str() + "', result is not used.";
else if (Token::Match(tok, "%var%")) else if (Token::Match(tok, "%var%"))
msg = "Unused variable value '" + tok->str() + "'"; msg = "Unused variable value '" + tok->str() + "'";
else if (Token::Match(valueTok, "%str%|%num%|%bool%|%char%")) { else if (isConstant(valueTok)) {
std::string typeStr("string"); std::string typeStr("string");
if (valueTok->isNumber()) if (valueTok->isNumber())
typeStr = "numeric"; typeStr = "numeric";
@ -1952,6 +1956,8 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
typeStr = "bool"; typeStr = "bool";
else if (valueTok->tokType() == Token::eChar) else if (valueTok->tokType() == Token::eChar)
typeStr = "character"; typeStr = "character";
else if (isNullOperand(valueTok))
typeStr = "NULL";
msg = "Redundant code: Found a statement that begins with " + typeStr + " constant."; msg = "Redundant code: Found a statement that begins with " + typeStr + " constant.";
} }
else if (!tok) else if (!tok)
@ -1966,7 +1972,7 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
msg = "Redundant code: Found unused member access."; msg = "Redundant code: Found unused member access.";
else if (tok->str() == "[" && tok->tokType() == Token::Type::eExtendedOp) else if (tok->str() == "[" && tok->tokType() == Token::Type::eExtendedOp)
msg = "Redundant code: Found unused array access."; msg = "Redundant code: Found unused array access.";
else { else if (mSettings->debugwarnings) {
reportError(tok, Severity::debug, "debug", "constStatementError not handled."); reportError(tok, Severity::debug, "debug", "constStatementError not handled.");
return; return;
} }

8
test/testincompletestatement.cpp
View File

@ -689,6 +689,14 @@ private:
" auto** elem = &parent.firstChild;\n" " auto** elem = &parent.firstChild;\n"
"}\n", /*inconclusive*/ true); "}\n", /*inconclusive*/ true);
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void f() {\n" // #11301
" NULL;\n"
" nullptr;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:2]: (warning) Redundant code: Found a statement that begins with NULL constant.\n"
"[test.cpp:3]: (warning) Redundant code: Found a statement that begins with NULL constant.\n",
errout.str());
} }
void vardecl() { void vardecl() {