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

Partial fix for #11599 false negative: constParameter (#4901)

This commit is contained in:
chrchr-github 2023-03-19 17:43:23 +01:00 committed by GitHub
parent 3b61ecd973
commit 19eef2c584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/astutils.cpp
View File

@ -2412,7 +2412,7 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
// If const is applied to the pointer, then the value can still be modified
if (Token::simpleMatch(arg->typeEndToken(), "* const"))
return true;
if (!arg->isPointer())
if (!arg->isPointer() && (!arg->valueType() || arg->valueType()->type == ValueType::UNKNOWN_TYPE))
return true;
}
if (!arg->isConst() && arg->isReference())

10
lib/checkother.cpp
View File

@ -1590,6 +1590,16 @@ void CheckOther::checkConstPointer()
continue;
} else if (Token::simpleMatch(gparent, "[") && gparent->astOperand2() == parent)
continue;
else if (Token::Match(gparent, "(|,")) {
const Token* ftok = gparent;
while (Token::simpleMatch(ftok, ","))
ftok = ftok->astParent();
if (ftok && Token::Match(ftok->astOperand1(), "%name% (")) {
bool inconclusive{};
if (!isVariableChangedByFunctionCall(ftok->astOperand1(), vt->pointer, var->declarationId(), mSettings, &inconclusive) && !inconclusive)
continue;
}
}
} else {
if (Token::Match(parent, "%oror%|%comp%|&&|?|!|-"))
continue;

26
test/testother.cpp
View File

@ -3363,6 +3363,28 @@ private:
" if (r == b) {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());
check("struct S {};\n" // #11599
"void g(S);\n"
"void h(const S&);\n"
"void h(int, int, const S&);\n"
"void i(S&);\n"
"void f1(S* s) {\n"
" g(*s);\n"
"}\n"
"void f2(S* s) {\n"
" h(*s);\n"
"}\n"
"void f3(S* s) {\n"
" h(1, 2, *s);\n"
"}\n"
"void f4(S* s) {\n"
" i(*s);\n"
"}\n");
ASSERT_EQUALS("[test.cpp:6]: (style) Parameter 's' can be declared as pointer to const\n"
"[test.cpp:9]: (style) Parameter 's' can be declared as pointer to const\n"
"[test.cpp:12]: (style) Parameter 's' can be declared as pointer to const\n",
errout.str());
}
void switchRedundantAssignmentTest() {
@ -10464,7 +10486,7 @@ private:
"}");
ASSERT_EQUALS("", errout.str());
check("void foo(char *c) {\n"
check("void foo(const char *c) {\n"
" if (*c == '+' && (operand || !isalnum(*c))) {}\n"
"}");
ASSERT_EQUALS("", errout.str());
@ -10482,7 +10504,7 @@ private:
" int x[] = { 10, 10 };\n"
" f(x[0]);\n"
"}");
ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'x' can be declared as const array\n", errout.str());
check("struct A { int x; };"
"void g(int);\n"