Skip to content

Fix #10484 FP knownConditionTrueFalse with static variable / partial fix for #10248 #3728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 2 commits into from
Feb 2, 2022
Merged

Fix #10484 FP knownConditionTrueFalse with static variable / partial fix for #10248 #3728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
534e32b
Fix #10484 FP knownConditionTrueFalse with static variable and direct…
chrchr-github Jan 20, 2022
fe621ec
Merge
chrchr-github Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/astutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2699,7 +2699,7 @@ static void getLHSVariablesRecursive(std::vector<const Variable*>& vars, const T
std::vector<const Variable*> getLHSVariables(const Token* tok)
{
std::vector<const Variable*> result;
if (!Token::Match(tok, "%assign%"))
if (!Token::Match(tok, "%assign%|(|{"))
return result;
if (!tok->astOperand1())
return result;
Expand Down
89 changes: 89 additions & 0 deletions test/testcondition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3867,6 +3867,95 @@ class TestCondition : public TestFixture {
"}\n");
ASSERT_EQUALS("", errout.str());

// #10484
check("void f() {\n"
" static bool init = true;\n"
" if (init)\n"
" init = false;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void f() {\n"
" static bool init(true);\n"
" if (init)\n"
" init = false;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void f() {\n"
" static bool init{ true };\n"
" if (init)\n"
" init = false;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

// #10248
check("void f() {\n"
" static int var(1);\n"
" if (var == 1) {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void f() {\n"
" static int var{ 1 };\n"
" if (var == 1) {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void Fun();\n"
"using Fn = void (*)();\n"
"void f() {\n"
" static Fn logger = nullptr;\n"
" if (logger == nullptr)\n"
" logger = Fun;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void Fun();\n"
"using Fn = void (*)();\n"
"void f() {\n"
" static Fn logger(nullptr);\n"
" if (logger == nullptr)\n"
" logger = Fun;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void Fun();\n"
"using Fn = void (*)();\n"
"void f() {\n"
" static Fn logger{ nullptr };\n"
" if (logger == nullptr)\n"
" logger = Fun;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void Fun();\n"
"typedef void (*Fn)();\n"
"void f() {\n"
" static Fn logger = nullptr;\n"
" if (logger == nullptr)\n"
" logger = Fun;\n"
"}\n");
TODO_ASSERT_EQUALS("", "[test.cpp:5]: (style) Condition 'logger==nullptr' is always true\n", errout.str());

check("void Fun();\n"
"typedef void (*Fn)();\n"
"void f() {\n"
" static Fn logger(nullptr);\n"
" if (logger == nullptr)\n"
" logger = Fun;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void Fun();\n"
"typedef void (*Fn)();\n"
"void f() {\n"
" static Fn logger{ nullptr };\n"
" if (logger == nullptr)\n"
" logger = Fun;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

// #9256
check("bool f() {\n"
" bool b = false;\n"
Expand Down