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

Fix #9262 (False positive on variable assignment when putting enum in namespace)

This commit is contained in:
Daniel Marjamäki 2019-10-19 21:41:50 +02:00
parent 9a2b71494f
commit 4943771e41
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/astutils.cpp
View File

@ -1827,8 +1827,8 @@ struct FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const
} }
} }
if (Token::simpleMatch(tok, ") {")) { if (Token::Match(tok, ")|do {")) {
if (Token::simpleMatch(tok->link()->previous(), "switch (")) if (tok->str() == ")" && Token::simpleMatch(tok->link()->previous(), "switch ("))
// TODO: parse switch // TODO: parse switch
return Result(Result::Type::BAILOUT); return Result(Result::Type::BAILOUT);
const Result &result1 = checkRecursive(expr, tok->tokAt(2), tok->linkAt(1), exprVarIds, local, inInnerClass); const Result &result1 = checkRecursive(expr, tok->tokAt(2), tok->linkAt(1), exprVarIds, local, inInnerClass);

18
test/testother.cpp
View File

@ -169,7 +169,7 @@ private:
TEST_CASE(redundantVarAssignment_7133); TEST_CASE(redundantVarAssignment_7133);
TEST_CASE(redundantVarAssignment_stackoverflow); TEST_CASE(redundantVarAssignment_stackoverflow);
TEST_CASE(redundantVarAssignment_lambda); TEST_CASE(redundantVarAssignment_lambda);
TEST_CASE(redundantVarAssignment_for); TEST_CASE(redundantVarAssignment_loop);
TEST_CASE(redundantVarAssignment_after_switch); TEST_CASE(redundantVarAssignment_after_switch);
TEST_CASE(redundantVarAssignment_pointer); TEST_CASE(redundantVarAssignment_pointer);
TEST_CASE(redundantVarAssignment_pointer_parameter); TEST_CASE(redundantVarAssignment_pointer_parameter);
@ -4586,7 +4586,9 @@ private:
" const bool y = a.f(A::C);\n" " const bool y = a.f(A::C);\n"
" if(!x && !y) return;\n" " if(!x && !y) return;\n"
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("[test.cpp:8]: (style) Argument 'A::B' to function f is always 0\n"
"[test.cpp:9]: (style) Argument 'A::C' to function f is always 1\n",
errout.str());
check("void foo() { \n" check("void foo() { \n"
" const bool x = a.f(A::B);\n" " const bool x = a.f(A::B);\n"
@ -6575,7 +6577,7 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void redundantVarAssignment_for() { void redundantVarAssignment_loop() {
check("void f() {\n" check("void f() {\n"
" char buf[10];\n" " char buf[10];\n"
" int i;\n" " int i;\n"
@ -6584,6 +6586,16 @@ private:
" buf[i] = 0;\n" " buf[i] = 0;\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void bar() {\n" // #9262 do-while with break
" int x = 0;\n"
" x = 432;\n"
" do {\n"
" if (foo()) break;\n"
" x = 1;\n"
" } while (false);\n"
"}");
ASSERT_EQUALS("", errout.str());
} }
void redundantVarAssignment_after_switch() { void redundantVarAssignment_after_switch() {