walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix issue 4744: ValueFlow: known integer result 

This fixes valueflow to have a value for `||` operator here:

```cpp
bool f()
{
	bool a = (4 == 3); // <-- 0
	bool b = (3 == 3); // <-- 1
	return a || b; // <-- 1
}
```
This commit is contained in:
Paul Fultz II 2019-01-03 07:05:31 +01:00 committed by Daniel Marjamäki
parent 2b63997c2c
commit bba6dfb8b2
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/valueflow.cpp
View File

@ -283,13 +283,17 @@ static const Token * skipValueInConditionalExpression(const Token * const valuet
if (prevIsLhs || !Token::Match(tok, "%oror%|&&|?|:"))
continue;
if (tok->hasKnownIntValue())
return tok;
// Is variable protected in LHS..
bool bailout = false;
visitAstNodes(tok->astOperand1(), [&](const Token *tok2) {
if (tok2->str() == ".")
return ChildrenToVisit::none;
// A variable is seen..
if (tok2 != valuetok && tok2->variable() && (tok2->varId() == valuetok->varId() || !tok2->variable()->isArgument())) {
if (tok2 != valuetok && tok2->variable() &&
(tok2->varId() == valuetok->varId() || (!tok2->variable()->isArgument() && !tok2->hasKnownIntValue()))) {
// TODO: limit this bailout
bailout = true;
return ChildrenToVisit::done;

13
test/testvalueflow.cpp
View File

@ -690,6 +690,19 @@ private:
"}";
ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
code = "bool f() {\n"
" bool a = (4 == 3);\n"
" bool b = (3 == 3);\n"
" return a || b;\n"
"}\n";
values = tokenValues(code, "%oror%");
ASSERT_EQUALS(1, values.size());
if (!values.empty()) {
ASSERT_EQUALS(true, values.front().isIntValue());
ASSERT_EQUALS(true, values.front().isKnown());
ASSERT_EQUALS(1, values.front().intvalue);
}
// function call => calculation
code = "void f(int x, int y) {\n"
" a = x + y;\n"