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

AST: Fixed FP in isSameExpression when there are different casts

This commit is contained in:
Daniel Marjamäki 2013-11-24 15:17:08 +01:00
parent d60c885f08
commit 13cd0f41f6
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/checkother.cpp
View File

@ -52,6 +52,16 @@ static bool isSameExpression(const Token *tok1, const Token *tok2, const std::se
}
if (Token::Match(tok1, "++|--"))
return false;
if (tok1->str() == "(" && tok1->previous() && !tok1->previous()->isName()) { // cast => assert that the casts are equal
const Token *t1 = tok1->next();
const Token *t2 = tok2->next();
while (t1 && t2 && t1->str() == t2->str() && (t1->isName() || t1->str() == "*")) {
t1 = t1->next();
t2 = t2->next();
}
if (!t1 || !t2 || t1->str() != ")" || t2->str() != ")")
return false;
}
if (!isSameExpression(tok1->astOperand1(), tok2->astOperand1(), constFunctions))
return false;
if (!isSameExpression(tok1->astOperand2(), tok2->astOperand2(), constFunctions))

11
test/testother.cpp
View File

@ -4820,6 +4820,17 @@ private:
check("int f() { return !!y; }"); // No FP
ASSERT_EQUALS("", errout.str());
// make sure there are not "same expression" fp when there are different casts
check("void f(long x) { if ((int32_t)x == (int64_t)x) {} }",
NULL, // filename
false, // experimental
false, // inconclusive
false, // posix
false, // runSimpleChecks
NULL // settings
);
ASSERT_EQUALS("", errout.str());
}
void duplicateIf1() { // ticket 3689 ( avoid false positive )