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

Fixed #7795 (ValueFlow: Value is not known after conditional increment )

This commit is contained in:
Daniel Marjamäki 2017-06-01 15:16:07 +02:00
parent 5efb2e3be0
commit bce0776417
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/valueflow.cpp
View File

@ -1317,6 +1317,13 @@ static bool valueFlowForward(Token * const startToken,
bailout(tokenlist, errorLogger, tok2, "variable " + var->name() + " valueFlowForward, conditional return is assumed to be executed"); bailout(tokenlist, errorLogger, tok2, "variable " + var->name() + " valueFlowForward, conditional return is assumed to be executed");
return false; return false;
} }
} else if (indentlevel <= 0 &&
Token::simpleMatch(tok2->link()->previous(), "else {") &&
!isReturnScope(tok2->link()->tokAt(-2)) &&
isVariableChanged(tok2->link(), tok2, varid, settings)) {
std::list<ValueFlow::Value>::iterator it;
for (it = values.begin(); it != values.end(); ++it)
it->changeKnownToPossible();
} }
} }

7
test/testvalueflow.cpp
View File

@ -2245,6 +2245,13 @@ private:
ASSERT_EQUALS(9, value.intvalue); ASSERT_EQUALS(9, value.intvalue);
ASSERT(value.isPossible()); ASSERT(value.isPossible());
code = "void f(int c) {\n"
" int x = 0;\n"
" if (c) {} else { x++; }\n"
" return x + 2;\n" // <- possible value
"}";
ASSERT(isNotKnownValues(code, "+"));
code = "void f() {\n" code = "void f() {\n"
" int x = 0;\n" " int x = 0;\n"
" fred.dostuff(x);\n" " fred.dostuff(x);\n"