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

Fix issue 9778: False positive: constParameter when returning non-const reference cast

This commit is contained in:
Paul 2020-06-26 15:47:59 -05:00
parent b33326bf51
commit cf475fab51
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkother.cpp
View File

@ -1368,8 +1368,10 @@ void CheckOther::checkConstVariable()
if (Function::returnsReference(function)) { if (Function::returnsReference(function)) {
std::vector<const Token*> returns = Function::findReturns(function); std::vector<const Token*> returns = Function::findReturns(function);
if (std::any_of(returns.begin(), returns.end(), [&](const Token* retTok) { if (std::any_of(returns.begin(), returns.end(), [&](const Token* retTok) {
if (retTok->varId() == var->declarationId()) if (retTok->varId() == var->declarationId())
return true; return true;
while (retTok && retTok->isCast())
retTok = retTok->astOperand2();
while (Token::simpleMatch(retTok, ".")) while (Token::simpleMatch(retTok, "."))
retTok = retTok->astOperand2(); retTok = retTok->astOperand2();
const Variable* retVar = getLifetimeVariable(getParentLifetime(retTok)); const Variable* retVar = getLifetimeVariable(getParentLifetime(retTok));

8
test/testother.cpp
View File

@ -2040,6 +2040,14 @@ private:
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
// #9778
check("struct A {};\n"
"struct B : A {};\n"
"B& f(A& x) {\n"
" return static_cast<B&>(x);\n"
"}\n");
ASSERT_EQUALS("", errout.str());
check("void e();\n" check("void e();\n"
"void g(void);\n" "void g(void);\n"
"void h(void);\n" "void h(void);\n"