Skip to content

Partial fix for #14037 Triplicate warnings for same issue (comparison with bool) #7727

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
chrchr-github merged 5 commits into from
Aug 11, 2025
Merged

Partial fix for #14037 Triplicate warnings for same issue (comparison with bool) #7727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51469d1
Update checkcondition.cpp
chrchr-github Aug 8, 2025
fb48a7a
Update testcondition.cpp
chrchr-github Aug 8, 2025
77fc969
Update checkcondition.cpp
chrchr-github Aug 8, 2025
e612a38
Update testcondition.cpp
chrchr-github Aug 8, 2025
7c557c2
Update std.cpp
chrchr-github Aug 8, 2025
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
5 changes: 3 additions & 2 deletions lib/checkcondition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2042,8 +2042,9 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
break;
}
}
if (error)
compareValueOutOfTypeRangeError(valueTok, typeTok->valueType()->str(), kiv, result);
if (!error || diag(tok))
continue;
compareValueOutOfTypeRangeError(valueTok, typeTok->valueType()->str(), kiv, result);
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions test/cfg/std.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2746,7 +2746,6 @@ void bool_isfinite(float f)
{
// cppcheck-suppress compareBoolExpressionWithInt
// cppcheck-suppress compareValueOutOfTypeRangeError
// cppcheck-suppress knownConditionTrueFalse
if (std::isfinite(f)==123) {}
}

Expand All @@ -2769,7 +2768,6 @@ void bool_isgreater(float f1, float f2)
{
// cppcheck-suppress compareBoolExpressionWithInt
// cppcheck-suppress compareValueOutOfTypeRangeError
// cppcheck-suppress knownConditionTrueFalse
if (std::isgreater(f1,f2)==123) {}
}

Expand All @@ -2792,7 +2790,6 @@ void bool_isgreaterequal(float f1, float f2)
{
// cppcheck-suppress compareBoolExpressionWithInt
// cppcheck-suppress compareValueOutOfTypeRangeError
// cppcheck-suppress knownConditionTrueFalse
if (std::isgreaterequal(f1, f2)==123) {}
}

Expand All @@ -2815,7 +2812,6 @@ void bool_isinf(float f)
{
// cppcheck-suppress compareBoolExpressionWithInt
// cppcheck-suppress compareValueOutOfTypeRangeError
// cppcheck-suppress knownConditionTrueFalse
if (std::isinf(f)==123) {}
}

Expand Down
6 changes: 6 additions & 0 deletions test/testcondition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6231,6 +6231,12 @@ class TestCondition : public TestFixture {
"[test.cpp:14:9]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always false. [compareValueOutOfTypeRangeError]\n"
"[test.cpp:17:9]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always true. [compareValueOutOfTypeRangeError]\n",
errout_str());

check("void f(bool b) {\n" // #14037
" if (b != 2) {}\n"
"}\n", dinit(CheckOptions, $.s = &settingsUnix64));
ASSERT_EQUALS("[test.cpp:2:14]: (style) Comparing expression of type 'bool' against value 2. Condition is always true. [compareValueOutOfTypeRangeError]\n",
errout_str());
}

void knownConditionCast() {
Expand Down