Skip to content

Fix FPs in bitwiseOnBoolean #3455

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 12 commits into from
Sep 19, 2021
Merged

Fix FPs in bitwiseOnBoolean #3455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7975f4d
Fix FPs in bitwiseOnBoolean
pfultz2 Sep 9, 2021
e88b37f
Format
pfultz2 Sep 9, 2021
48d5c27
Update message for a|b
pfultz2 Sep 9, 2021
0ac9ba9
Format
pfultz2 Sep 9, 2021
969354e
Remove commented code
pfultz2 Sep 9, 2021
4ce0d00
Update message
pfultz2 Sep 12, 2021
3dad9a8
Remove extra parameter
pfultz2 Sep 12, 2021
53853c5
Format
pfultz2 Sep 12, 2021
7f1df8f
Fix copy and paste error
pfultz2 Sep 16, 2021
350fc38
Merge branch 'fp-bitwise-bool-non-const' of github.com:pfultz2/cppche…
pfultz2 Sep 16, 2021
5981f95
Merge branch 'main' into fp-bitwise-bool-non-const
pfultz2 Sep 18, 2021
d332559
Check if converted to boolean
pfultz2 Sep 18, 2021
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
32 changes: 24 additions & 8 deletions lib/checkbool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ void CheckBool::incrementBooleanError(const Token *tok)
);
}

static bool isConvertedToBool(const Token* tok)
{
if (!tok->astParent())
return false;
return astIsBool(tok->astParent()) || Token::Match(tok->astParent()->previous(), "if|while (");
}

//---------------------------------------------------------------------------
// if (bool & bool) -> if (bool && bool)
// if (bool | bool) -> if (bool || bool)
Expand All @@ -90,20 +97,29 @@ void CheckBool::checkBitwiseOnBoolean()
for (const Scope * scope : symbolDatabase->functionScopes) {
for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
if (tok->isBinaryOp() && (tok->str() == "&" || tok->str() == "|")) {
if (astIsBool(tok->astOperand1()) || astIsBool(tok->astOperand2())) {
if (tok->astOperand2()->variable() && tok->astOperand2()->variable()->nameToken() == tok->astOperand2())
continue;
const std::string expression = astIsBool(tok->astOperand1()) ? tok->astOperand1()->expressionString() : tok->astOperand2()->expressionString();
bitwiseOnBooleanError(tok, expression, tok->str() == "&" ? "&&" : "||");
}
if (!(astIsBool(tok->astOperand1()) || astIsBool(tok->astOperand2())))
continue;
if (tok->str() == "|" && !isConvertedToBool(tok) && !(astIsBool(tok->astOperand1()) && astIsBool(tok->astOperand2())))
continue;
if (!isConstExpression(tok->astOperand1(), mSettings->library, true, mTokenizer->isCPP()))
continue;
if (!isConstExpression(tok->astOperand2(), mSettings->library, true, mTokenizer->isCPP()))
continue;
if (tok->astOperand2()->variable() && tok->astOperand2()->variable()->nameToken() == tok->astOperand2())
continue;
const std::string expression = astIsBool(tok->astOperand1()) ? tok->astOperand1()->expressionString()
: tok->astOperand2()->expressionString();
bitwiseOnBooleanError(tok, expression, tok->str() == "&" ? "&&" : "||");
}
}
}
}

void CheckBool::bitwiseOnBooleanError(const Token *tok, const std::string &expression, const std::string &op)
void CheckBool::bitwiseOnBooleanError(const Token* tok, const std::string& expression, const std::string& op)
{
reportError(tok, Severity::style, "bitwiseOnBoolean",
reportError(tok,
Severity::style,
"bitwiseOnBoolean",
"Boolean expression '" + expression + "' is used in bitwise operation. Did you mean '" + op + "'?",
CWE398,
Certainty::inconclusive);
Expand Down
2 changes: 1 addition & 1 deletion lib/checkbool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class CPPCHECKLIB CheckBool : public Check {
void comparisonOfBoolWithInvalidComparator(const Token *tok, const std::string &expression);
void assignBoolToPointerError(const Token *tok);
void assignBoolToFloatError(const Token *tok);
void bitwiseOnBooleanError(const Token *tok, const std::string &expression, const std::string &op);
void bitwiseOnBooleanError(const Token* tok, const std::string& expression, const std::string& op);
void comparisonOfBoolExpressionWithIntError(const Token *tok, bool not0or1);
void pointerArithBoolError(const Token *tok);
void returnValueBoolError(const Token *tok);
Expand Down
26 changes: 26 additions & 0 deletions test/testbool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,26 @@ class TestBool : public TestFixture {
"}");
ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a>0' is used in bitwise operation. Did you mean '&&'?\n", errout.str());

check("void f(bool a, int b) {\n"
" if(a | b) {}\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'?\n", errout.str());

check("void f(int a, bool b) {\n"
" if(a | b) {}\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation. Did you mean '||'?\n", errout.str());

check("int f(bool a, int b) {\n"
" return a | b;\n"
"}");
ASSERT_EQUALS("", errout.str());

check("bool f(bool a, int b) {\n"
" return a | b;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'?\n", errout.str());

check("void f(int a, int b) {\n"
" if(a & b) {}\n"
"}");
Expand All @@ -824,6 +844,12 @@ class TestBool : public TestFixture {
" class C { void foo(bool &b) {} };\n"
"}");
ASSERT_EQUALS("", errout.str());

check("bool f();\n"
"bool g() {\n"
" return f() | f();\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}

void incrementBoolean() {
Expand Down