Skip to content

Fixup #14303: Function pointers are not known to be 1 #8919

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

Open
chrchr-github wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −7
Open

Fixup #14303: Function pointers are not known to be 1 #8919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -1554,7 +1554,7 @@ bool isUsedAsBool(const Token* const tok, const Settings& settings)
return true;
if (parent->isCast())
return !Token::simpleMatch(parent->astOperand1(), "dynamic_cast") && isUsedAsBool(parent, settings);
if (Token::Match(parent, "==|!=") && tok->valueType() && tok->valueType()->pointer &&
if (Token::Match(parent, "==|!=") && ((tok->valueType() && tok->valueType()->pointer) || tok->function()) &&
tok->astSibling()->hasKnownIntValue() && tok->astSibling()->getKnownIntValue() == 0)
return true;
if (parent->str() == "(" && astIsRHS(tok) && Token::Match(parent->astOperand1(), "if|while"))
Expand Down
3 changes: 1 addition & 2 deletions lib/valueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5166,8 +5166,7 @@ static void valueFlowInferCondition(TokenList& tokenlist, const Settings& settin
}
} else if (Token::Match(tok->astParent(), "?|&&|!|%oror%") ||
Token::Match(tok->astParent()->previous(), "if|while (") ||
(astIsPointer(tok) && isUsedAsBool(tok, settings)) ||
tok->function()) {
((astIsPointer(tok) || tok->function()) && isUsedAsBool(tok, settings))) {
std::vector<ValueFlow::Value> result = infer(makeIntegralInferModel(), "!=", tok->values(), 0);
if (result.size() != 1)
continue;
Expand Down
10 changes: 6 additions & 4 deletions test/testcondition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5518,10 +5518,12 @@ class TestCondition : public TestFixture {
" auto q = g;\n"
" if (q == nullptr) {}\n"
"};\n");
ASSERT_EQUALS("[test.cpp:4:11]: (style) Condition 'p==nullptr' is always false [knownConditionTrueFalse]\n"
"[test.cpp:5:11]: (style) Condition 'g==nullptr' is always false [knownConditionTrueFalse]\n"
"[test.cpp:7:11]: (style) Condition 'q==nullptr' is always false [knownConditionTrueFalse]\n",
errout_str());
TODO_ASSERT_EQUALS("[test.cpp:4:11]: (style) Condition 'p==nullptr' is always false [knownConditionTrueFalse]\n"
"[test.cpp:5:11]: (style) Condition 'g==nullptr' is always false [knownConditionTrueFalse]\n"
"[test.cpp:7:11]: (style) Condition 'q==nullptr' is always false [knownConditionTrueFalse]\n",
"[test.cpp:4:11]: (style) Condition 'p==nullptr' is always false [knownConditionTrueFalse]\n"
"[test.cpp:5:11]: (style) Condition 'g==nullptr' is always false [knownConditionTrueFalse]\n",
errout_str());
}

void alwaysTrueContainer() {
Expand Down
10 changes: 10 additions & 0 deletions test/testvalueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3286,6 +3286,16 @@ class TestValueFlow : public TestFixture {
" }\n"
"};\n";
ASSERT_EQUALS(false, testValueOfXKnown(code, 7U, 0));

code = "int g() { return 0; }\n"
"int f() {\n"
" int (*x)() = g;\n"
" return x();\n"
"}\n";
auto values = tokenValues(code, "x (");
ASSERT_EQUALS(1U, values.size());
ASSERT(values.front().isImpossible());
ASSERT_EQUALS(0, values.front().intvalue);
}

void valueFlowAfterSwap()
Expand Down
Loading