Skip to content

Fix #14660 Handle reverse conditions in isOppositeCond function #8408

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 3 commits into from
Apr 12, 2026
+52 −12
Merged

Fix #14660 Handle reverse conditions in isOppositeCond function #8408

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fc115d
Handle reverse conditions in isOppositeCond function
francois-berder Apr 1, 2026
37efa2e
fixup! Handle reverse conditions in isOppositeCond function
francois-berder Apr 5, 2026
303be34
fixup! fixup! Handle reverse conditions in isOppositeCond function
francois-berder Apr 10, 2026
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
69 changes: 54 additions & 15 deletions lib/astutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,21 +1810,36 @@ bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Se
return commutativeEquals;
}

static bool isZeroBoundCond(const Token * const cond)
static bool isZeroBoundCond(const Token * const cond, bool reverse)
{
if (cond == nullptr)
if (cond == nullptr || cond->astOperand1() == nullptr || cond->astOperand2() == nullptr)
Comment thread
danmar marked this conversation as resolved.
Outdated
return false;
// Assume unsigned
// TODO: Handle reverse conditions
const bool isZero = cond->astOperand2()->getValue(0);
if (cond->str() == "==" || cond->str() == ">=")
return isZero;
if (cond->str() == "<=")
return true;
if (cond->str() == "<")
return !isZero;
if (cond->str() == ">")

if ((reverse && !cond->astOperand1()->hasKnownIntValue()) || (!reverse && !cond->astOperand2()->hasKnownIntValue()))
Comment thread
danmar marked this conversation as resolved.
Outdated
return false;

// Assume unsigned
const bool isZero = reverse ? cond->astOperand1()->getKnownIntValue() == 0 : cond->astOperand2()->getKnownIntValue() == 0;
if (reverse) {
if (cond->str() == "==" || cond->str() == "<=")
return isZero;
if (cond->str() == ">=")
return true;
if (cond->str() == ">")
return !isZero;
if (cond->str() == "<")
return false;
} else {
if (cond->str() == "==" || cond->str() == ">=")
return isZero;
if (cond->str() == "<=")
return true;
if (cond->str() == "<")
return !isZero;
if (cond->str() == ">")
return false;
}

return false;
}

Expand Down Expand Up @@ -1888,7 +1903,7 @@ bool isOppositeCond(bool isNot, const Token * const cond1, const Token * const c
if (isSameExpression(true, cond1->astOperand2(), cond2->astOperand2(), settings, pure, followVar, errors))
return isDifferentKnownValues(cond1->astOperand1(), cond2->astOperand1());
}
// TODO: Handle reverse conditions

if (Library::isContainerYield(cond1, Library::Container::Yield::EMPTY, "empty") &&
Library::isContainerYield(cond2->astOperand1(), Library::Container::Yield::SIZE, "size") &&
isSameExpression(true,
Expand All @@ -1898,7 +1913,19 @@ bool isOppositeCond(bool isNot, const Token * const cond1, const Token * const c
pure,
followVar,
errors)) {
return !isZeroBoundCond(cond2);
return !isZeroBoundCond(cond2, false);
}

if (Library::isContainerYield(cond1, Library::Container::Yield::EMPTY, "empty") &&
Library::isContainerYield(cond2->astOperand2(), Library::Container::Yield::SIZE, "size") &&
isSameExpression(true,
cond1->astOperand1()->astOperand1(),
cond2->astOperand2()->astOperand1()->astOperand1(),
settings,
pure,
followVar,
errors)) {
return !isZeroBoundCond(cond2, true);
}

if (Library::isContainerYield(cond2, Library::Container::Yield::EMPTY, "empty") &&
Expand All @@ -1910,7 +1937,19 @@ bool isOppositeCond(bool isNot, const Token * const cond1, const Token * const c
pure,
followVar,
errors)) {
return !isZeroBoundCond(cond1);
return !isZeroBoundCond(cond1, false);
}

if (Library::isContainerYield(cond2, Library::Container::Yield::EMPTY, "empty") &&
Library::isContainerYield(cond1->astOperand2(), Library::Container::Yield::SIZE, "size") &&
isSameExpression(true,
cond2->astOperand1()->astOperand1(),
cond1->astOperand2()->astOperand1()->astOperand1(),
settings,
pure,
followVar,
errors)) {
return !isZeroBoundCond(cond1, true);
}
}

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 @@ -2674,6 +2674,12 @@ class TestCondition : public TestFixture {
check("void f1(const std::string &s) { if(s.size() >= 0) if(s.empty()) {}} "); // CheckOther says: Unsigned expression 's.size()' can't be negative so it is unnecessary to test it. [unsignedPositive]
ASSERT_EQUALS("", errout_str());

check("void f1(const std::string &s) { if(42 < s.size()) if(s.empty()) {}}");
ASSERT_EQUALS("[test.cpp:1:39] -> [test.cpp:1:61]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
Copy link
Copy Markdown
Collaborator

@danmar danmar Apr 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm I feel it's out of scope for this PR but I feel the warning message is a bit obfuscated. The "leads to a dead code block" is true but it's an indirect consequence. I think it would be better to try to describe the direct consequence that inner condition s.empty() is always false.
I also feel that sometimes opposite inner conditions doesn't necessarily lead to dead code.. i.e.: if (x < 0 || s.empty()) I don't know if we warn but imho it should be OK to warn if the message is clear..


check("void f1(const std::string &s) { if(s.empty()) if(42 < s.size()) {}}");
ASSERT_EQUALS("[test.cpp:1:43] -> [test.cpp:1:53]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());

// TODO: These are identical condition since size cannot be negative
check("void f1(const std::string &s) { if(s.size() <= 0) if(s.empty()) {}}");
ASSERT_EQUALS("", errout_str());
Expand Down
Loading