Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 31 additions & 14 deletions lib/checkother.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2022,7 +2022,7 @@ static bool isConstant(const Token* tok) {
return tok && (tok->isEnumerator() || Token::Match(tok, "%bool%|%num%|%str%|%char%|nullptr|NULL"));
}

static bool isConstStatement(const Token *tok, bool isNestedBracket = false)
static bool isConstStatement(const Token *tok, const Library& library, bool isNestedBracket = false)
{
if (!tok)
return false;
Expand All @@ -2044,45 +2044,60 @@ static bool isConstStatement(const Token *tok, bool isNestedBracket = false)
tok2 = tok2->astParent();
}
if (Token::Match(tok, "&&|%oror%"))
return isConstStatement(tok->astOperand1()) && isConstStatement(tok->astOperand2());
return isConstStatement(tok->astOperand1(), library) && isConstStatement(tok->astOperand2(), library);
if (Token::Match(tok, "!|~|%cop%") && (tok->astOperand1() || tok->astOperand2()))
return true;
if (Token::simpleMatch(tok->previous(), "sizeof ("))
return true;
if (isCPPCast(tok)) {
if (Token::simpleMatch(tok->astOperand1(), "dynamic_cast") && Token::simpleMatch(tok->astOperand1()->linkAt(1)->previous(), "& >"))
return false;
return isWithoutSideEffects(tok) && isConstStatement(tok->astOperand2());
return isWithoutSideEffects(tok) && isConstStatement(tok->astOperand2(), library);
}
if (tok->isCast() && tok->next() && tok->next()->isStandardType())
return isWithoutSideEffects(tok->astOperand1()) && isConstStatement(tok->astOperand1());
return isWithoutSideEffects(tok->astOperand1()) && isConstStatement(tok->astOperand1(), library);
if (Token::simpleMatch(tok, "."))
return isConstStatement(tok->astOperand2());
return isConstStatement(tok->astOperand2(), library);
if (Token::simpleMatch(tok, ",")) {
if (tok->astParent()) // warn about const statement on rhs at the top level
return isConstStatement(tok->astOperand1()) && isConstStatement(tok->astOperand2());
return isConstStatement(tok->astOperand1(), library) && isConstStatement(tok->astOperand2(), library);

const Token* lml = previousBeforeAstLeftmostLeaf(tok); // don't warn about matrix/vector assignment (e.g. Eigen)
if (lml)
lml = lml->next();
const Token* stream = lml;
while (stream && Token::Match(stream->astParent(), ".|[|(|*"))
stream = stream->astParent();
return (!stream || !isLikelyStream(stream)) && isConstStatement(tok->astOperand2());
return (!stream || !isLikelyStream(stream)) && isConstStatement(tok->astOperand2(), library);
}
if (Token::simpleMatch(tok, "?") && Token::simpleMatch(tok->astOperand2(), ":")) // ternary operator
return isConstStatement(tok->astOperand1()) && isConstStatement(tok->astOperand2()->astOperand1()) && isConstStatement(tok->astOperand2()->astOperand2());
return isConstStatement(tok->astOperand1(), library) && isConstStatement(tok->astOperand2()->astOperand1(), library) && isConstStatement(tok->astOperand2()->astOperand2(), library);
if (isBracketAccess(tok) && isWithoutSideEffects(tok->astOperand1(), /*checkArrayAccess*/ true, /*checkReference*/ false)) {
const bool isChained = succeeds(tok->astParent(), tok);
if (Token::simpleMatch(tok->astParent(), "[")) {
if (isChained)
return isConstStatement(tok->astOperand2()) && isConstStatement(tok->astParent());
return isNestedBracket && isConstStatement(tok->astOperand2());
return isConstStatement(tok->astOperand2(), library) && isConstStatement(tok->astParent(), library);
return isNestedBracket && isConstStatement(tok->astOperand2(), library);
}
return isConstStatement(tok->astOperand2(), /*isNestedBracket*/ !isChained);
return isConstStatement(tok->astOperand2(), library, /*isNestedBracket*/ !isChained);
}
if (!tok->astParent() && findLambdaEndToken(tok))
return true;

tok2 = tok;
if (tok2->str() == "::")
tok2 = tok2->next();
if (Token::Match(tok2, "%name% ;")) {
if (tok2->function())
return true;
std::string funcStr = tok2->str();
while (tok2->index() > 1 && Token::Match(tok2->tokAt(-2), "%name% ::")) {
funcStr.insert(0, tok2->strAt(-2) + "::");
tok2 = tok2->tokAt(-2);
}
if (library.functions().count(funcStr) > 0)
return true;
}
return false;
}

Expand Down Expand Up @@ -2174,7 +2189,7 @@ void CheckOther::checkIncompleteStatement()
// Skip statement expressions
if (Token::simpleMatch(rtok, "; } )"))
continue;
if (!isConstStatement(tok))
if (!isConstStatement(tok, mSettings->library))
continue;
if (isVoidStmt(tok))
continue;
Expand Down Expand Up @@ -2228,6 +2243,8 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
msg = "Redundant code: Found unused array access.";
else if (tok->str() == "[" && !tok->astParent())
msg = "Redundant code: Found unused lambda.";
else if (Token::Match(tok, "%name%|::"))
msg = "Redundant code: Found unused function.";
else if (mSettings->debugwarnings) {
reportError(tok, Severity::debug, "debug", "constStatementError not handled.");
return;
Expand Down Expand Up @@ -2365,7 +2382,7 @@ void CheckOther::checkMisusedScopedObject()
if (Token::simpleMatch(parTok, "<") && parTok->link())
parTok = parTok->link()->next();
if (const Token* arg = parTok->astOperand2()) {
if (!isConstStatement(arg))
if (!isConstStatement(arg, mSettings->library))
continue;
if (parTok->str() == "(") {
if (arg->varId() && !(arg->variable() && arg->variable()->nameToken() != arg))
Expand Down Expand Up @@ -2826,7 +2843,7 @@ void CheckOther::checkDuplicateExpression()
} else if (tok->astOperand1() && tok->astOperand2() && tok->str() == ":" && tok->astParent() && tok->astParent()->str() == "?") {
if (!tok->astOperand1()->values().empty() && !tok->astOperand2()->values().empty() && isEqualKnownValue(tok->astOperand1(), tok->astOperand2()) &&
!isVariableChanged(tok->astParent(), /*indirect*/ 0, *mSettings) &&
isConstStatement(tok->astOperand1()) && isConstStatement(tok->astOperand2()))
isConstStatement(tok->astOperand1(), mSettings->library) && isConstStatement(tok->astOperand2(), mSettings->library))
duplicateValueTernaryError(tok);
else if (isSameExpression(true, tok->astOperand1(), tok->astOperand2(), *mSettings, false, true, &errorPath))
duplicateExpressionTernaryError(tok, std::move(errorPath));
Expand Down
18 changes: 17 additions & 1 deletion test/testincompletestatement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class TestIncompleteStatement : public TestFixture {
TestIncompleteStatement() : TestFixture("TestIncompleteStatement") {}

private:
const Settings settings = settingsBuilder().severity(Severity::warning).build();
const Settings settings = settingsBuilder().severity(Severity::warning).library("std.cfg").build();

struct CheckOptions
{
Expand Down Expand Up @@ -84,6 +84,7 @@ class TestIncompleteStatement : public TestFixture {
TEST_CASE(archive); // ar & x
TEST_CASE(ast);
TEST_CASE(oror); // dostuff() || x=32;
TEST_CASE(functioncall);
}

void test1() {
Expand Down Expand Up @@ -792,6 +793,21 @@ class TestIncompleteStatement : public TestFixture {
"}\n", dinit(CheckOptions, $.inconclusive = true));
ASSERT_EQUALS("", errout_str());
}

void functioncall() {
check("void g();\n" // #13794
"void f() {\n"
" g;\n"
" exit;\n"
" std::free;\n"
" ::std::terminate;\n"
"}\n", dinit(CheckOptions, $.inconclusive = true));
ASSERT_EQUALS("[test.cpp:3:5]: (warning) Redundant code: Found unused function. [constStatement]\n"
"[test.cpp:4:5]: (warning) Redundant code: Found unused function. [constStatement]\n"
"[test.cpp:5:8]: (warning) Redundant code: Found unused function. [constStatement]\n"
"[test.cpp:6:10]: (warning) Redundant code: Found unused function. [constStatement]\n",
errout_str());
}
};

REGISTER_TEST(TestIncompleteStatement)
Loading