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

Fix #10919 FP: constStatement with template type (#3941)

This commit is contained in:
chrchr-github 2022-03-25 17:03:54 +01:00 committed by GitHub
parent 8d7fe702e0
commit fe7d0eeffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/checkother.cpp
View File

@ -1740,6 +1740,20 @@ static bool isVarDeclOp(const Token* tok)
return isType(typetok, Token::Match(vartok, "%var%"));
}
static bool isBracketAccess(const Token* tok)
{
if (!Token::simpleMatch(tok, "[") || !tok->astOperand1())
return false;
tok = tok->astOperand1();
if (tok->str() == ".")
tok = tok->astOperand2();
while (Token::simpleMatch(tok, "["))
tok = tok->astOperand1();
if (!tok || !tok->variable())
return false;
return tok->variable()->nameToken() != tok;
}
static bool isConstStatement(const Token *tok, bool cpp)
{
if (!tok)
@ -1769,7 +1783,7 @@ static bool isConstStatement(const Token *tok, bool cpp)
return tok->astParent() ? isConstStatement(tok->astOperand1(), cpp) && isConstStatement(tok->astOperand2(), cpp) : isConstStatement(tok->astOperand2(), cpp);
if (Token::simpleMatch(tok, "?") && Token::simpleMatch(tok->astOperand2(), ":")) // ternary operator
return isConstStatement(tok->astOperand1(), cpp) && isConstStatement(tok->astOperand2()->astOperand1(), cpp) && isConstStatement(tok->astOperand2()->astOperand2(), cpp);
if (Token::simpleMatch(tok, "[") && !Token::Match(tok->tokAt(-2), "%type% %name%") && isWithoutSideEffects(cpp, tok->astOperand1(), /*checkArrayAccess*/ true)) {
if (isBracketAccess(tok) && isWithoutSideEffects(cpp, tok->astOperand1(), /*checkArrayAccess*/ true)) {
if (Token::simpleMatch(tok->astParent(), "["))
return isConstStatement(tok->astOperand2(), cpp) && isConstStatement(tok->astParent(), cpp);
return isConstStatement(tok->astOperand2(), cpp);

1
test/testincompletestatement.cpp
View File

@ -531,6 +531,7 @@ private:
" j[0][0][h()];\n"
" std::map<std::string, int> M;\n"
" M[\"abc\"];\n"
" std::auto_ptr<Int> app[4];" // #10919
"}\n");
ASSERT_EQUALS("", errout.str());