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

simplified the code for ValueFlow Known/Possible values

This commit is contained in:
Daniel Marjamäki 2015-07-25 19:36:29 +02:00
parent cfde690bb2
commit afd9f071c0
4 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkcondition.cpp
View File

@ -975,7 +975,7 @@ void CheckCondition::alwaysTrueFalse()
continue;
if (tok->values.size() != 1U)
continue;
if (tok->values.front().valueKind != ValueFlow::Value::Known)
if (!tok->values.front().isKnown())
continue;
if (tok->astParent() && Token::Match(tok->astParent()->previous(), "%name% ("))

38
lib/valueflow.cpp
View File

@ -380,9 +380,7 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value)
ValueFlow::Value v(value);
v.conditional = true;
if (v.valueKind == ValueFlow::Value::Known)
v.valueKind = ValueFlow::Value::Possible;
v.changeKnownToPossible();
if (!variables.empty())
v.varId = *(variables.begin());
@ -393,9 +391,9 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value)
// Calculations..
else if (parent->isArithmeticalOp() && parent->astOperand1() && parent->astOperand2()) {
const bool known = ((parent->astOperand1()->values.size() == 1U &&
parent->astOperand1()->values.front().valueKind == ValueFlow::Value::ValueKind::Known) ||
parent->astOperand1()->values.front().isKnown()) ||
(parent->astOperand2()->values.size() == 1U &&
parent->astOperand2()->values.front().valueKind == ValueFlow::Value::ValueKind::Known));
parent->astOperand2()->values.front().isKnown()));
std::list<ValueFlow::Value>::const_iterator value1, value2;
for (value1 = parent->astOperand1()->values.begin(); value1 != parent->astOperand1()->values.end(); ++value1) {
for (value2 = parent->astOperand2()->values.begin(); value2 != parent->astOperand2()->values.end(); ++value2) {
@ -500,7 +498,7 @@ static void valueFlowNumber(TokenList *tokenlist)
for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
if (tok->isNumber() && MathLib::isInt(tok->str())) {
ValueFlow::Value value(MathLib::toLongNumber(tok->str()));
value.valueKind = ValueFlow::Value::Known;
value.setKnown();
setTokenValue(tok, value);
}
}
@ -509,7 +507,7 @@ static void valueFlowNumber(TokenList *tokenlist)
for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
if (tok->isName() && !tok->varId() && Token::Match(tok, "false|true")) {
ValueFlow::Value value(tok->str() == "true");
value.valueKind = ValueFlow::Value::Known;
value.setKnown();
setTokenValue(tok, value);
}
}
@ -522,7 +520,7 @@ static void valueFlowString(TokenList *tokenlist)
if (tok->type() == Token::eString) {
ValueFlow::Value strvalue;
strvalue.tokvalue = tok;
strvalue.valueKind = ValueFlow::Value::Known;
strvalue.setKnown();
setTokenValue(tok, strvalue);
}
}
@ -893,14 +891,14 @@ static void handleKnownValuesInLoop(const Token *loopBodyStart,
{
bool isChanged = false;
for (std::list<ValueFlow::Value>::iterator it = values->begin(); it != values->end(); ++it) {
if (it->valueKind == ValueFlow::Value::Known) {
if (it->isKnown()) {
if (!isChanged) {
if (!isVariableChanged(loopBodyStart, loopBodyStart->link(), varid))
break;
isChanged = true;
}
it->valueKind = ValueFlow::Value::Possible;
it->setPossible();
}
}
}
@ -1079,8 +1077,7 @@ static bool valueFlowForward(Token * const startToken,
if (it->condition || it->conditional)
values.erase(it++);
else {
if (it->valueKind == ValueFlow::Value::Known)
it->valueKind = ValueFlow::Value::Possible;
it->changeKnownToPossible();
++it;
}
}
@ -1156,8 +1153,7 @@ static bool valueFlowForward(Token * const startToken,
std::list<ValueFlow::Value>::iterator it;
for (it = values.begin(); it != values.end(); ++it) {
it->conditional = true;
if (it->valueKind == ValueFlow::Value::Known)
it->valueKind = ValueFlow::Value::Possible;
it->changeKnownToPossible();
}
if (Token::simpleMatch(tok2,"} else {"))
@ -1171,8 +1167,7 @@ static bool valueFlowForward(Token * const startToken,
tok2 = const_cast<Token *>(scope->classEnd);
--indentlevel;
for (std::list<ValueFlow::Value>::iterator it = values.begin(); it != values.end(); ++it) {
if (it->valueKind == ValueFlow::Value::ValueKind::Known)
it->valueKind = ValueFlow::Value::ValueKind::Possible;
it->changeKnownToPossible();
}
continue;
}
@ -1364,8 +1359,7 @@ static void valueFlowAfterAssign(TokenList *tokenlist, SymbolDatabase* symboldat
// Static variable initialisation?
if (var->isStatic() && var->nameToken() == tok->astOperand1()) {
for (std::list<ValueFlow::Value>::iterator it = values.begin(); it != values.end(); ++it) {
if (it->valueKind == ValueFlow::Value::ValueKind::Known)
it->valueKind = ValueFlow::Value::ValueKind::Possible;
it->changeKnownToPossible();
}
}
@ -2019,8 +2013,7 @@ static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger,
// passed values are not "known"..
for (std::list<ValueFlow::Value>::iterator it = argvalues.begin(); it != argvalues.end(); ++it) {
if (it->valueKind == ValueFlow::Value::Known)
it->valueKind = ValueFlow::Value::Possible;
it->changeKnownToPossible();
}
valueFlowInjectParameter(tokenlist, errorLogger, settings, arg, functionScope, argvalues);
@ -2047,9 +2040,8 @@ static void valueFlowFunctionDefaultParameter(TokenList *tokenlist, SymbolDataba
for (std::list<ValueFlow::Value>::const_iterator it = values.begin(); it != values.end(); ++it) {
ValueFlow::Value v(*it);
v.defaultArg = true;
if (v.valueKind == ValueFlow::Value::Known)
v.valueKind = ValueFlow::Value::Possible;
if (v.valueKind == ValueFlow::Value::Possible)
v.changeKnownToPossible();
if (v.isPossible())
argvalues.push_back(v);
}
if (!argvalues.empty())

21
lib/valueflow.h
View File

@ -68,6 +68,27 @@ namespace ValueFlow {
/** Min value. Smaller values are impossible. */
Min
} valueKind;
void setKnown() {
valueKind = ValueKind::Known;
}
bool isKnown() const {
return valueKind == ValueKind::Known;
}
void setPossible() {
valueKind = ValueKind::Possible;
}
bool isPossible() const {
return valueKind == ValueKind::Possible;
}
void changeKnownToPossible() {
if (isKnown())
valueKind = ValueKind::Possible;
}
};
void setValues(TokenList *tokenlist, SymbolDatabase* symboldatabase, ErrorLogger *errorLogger, const Settings *settings);

20
test/testvalueflow.cpp
View File

@ -1547,9 +1547,9 @@ private:
const std::list<ValueFlow::Value> values = tokenValues(code, str);
bool possible = false;
for (std::list<ValueFlow::Value>::const_iterator it = values.begin(); it != values.end(); ++it) {
if (it->valueKind == ValueFlow::Value::Known)
if (it->isKnown())
return false;
if (it->valueKind == ValueFlow::Value::Possible)
if (it->isPossible())
possible = true;
}
return possible;
@ -1559,7 +1559,7 @@ private:
const char *code;
ValueFlow::Value value;
ASSERT_EQUALS(ValueFlow::Value::ValueKind::Known, valueOfTok("x = 1;", "1").valueKind);
ASSERT(valueOfTok("x = 1;", "1").isKnown());
// after assignment
code = "void f() {\n"
@ -1568,7 +1568,7 @@ private:
"}";
value = valueOfTok(code, "+");
ASSERT_EQUALS(3, value.intvalue);
ASSERT_EQUALS(ValueFlow::Value::ValueKind::Known, value.valueKind);
ASSERT(value.isKnown());
code = "void f() {\n"
" int x;\n"
@ -1577,7 +1577,7 @@ private:
"}";
value = valueOfTok(code, "+");
ASSERT_EQUALS(9, value.intvalue);
ASSERT_EQUALS(ValueFlow::Value::ValueKind::Possible, value.valueKind);
ASSERT(value.isPossible());
code = "void f() {\n"
" int x = 0;\n"
@ -1617,7 +1617,7 @@ private:
"}";
value = valueOfTok(code, "!");
ASSERT_EQUALS(1, value.intvalue);
ASSERT_EQUALS(ValueFlow::Value::ValueKind::Possible, value.valueKind);
ASSERT(value.isPossible());
code = "void f() {\n"
" static int x = 0;\n"
@ -1625,7 +1625,7 @@ private:
"}\n";
value = valueOfTok(code, "+");
ASSERT_EQUALS(1, value.intvalue);
ASSERT_EQUALS(ValueFlow::Value::ValueKind::Possible, value.valueKind);
ASSERT(value.isPossible());
code = "void f() {\n"
" int x = 0;\n"
@ -1635,7 +1635,7 @@ private:
"}";
value = valueOfTok(code, "!");
ASSERT_EQUALS(1, value.intvalue);
ASSERT_EQUALS(ValueFlow::Value::ValueKind::Possible, value.valueKind);
ASSERT(value.isPossible());
// after condition
code = "int f(int x) {\n"
@ -1644,14 +1644,14 @@ private:
"}";
value = valueOfTok(code, "+");
ASSERT_EQUALS(5, value.intvalue);
ASSERT_EQUALS(ValueFlow::Value::ValueKind::Possible, value.valueKind);
ASSERT(value.isPossible());
// function
code = "int f(int x) { return x + 1; }\n" // <- possible value
"void a() { f(12); }\b";
value = valueOfTok(code, "+");
ASSERT_EQUALS(13, value.intvalue);
ASSERT_EQUALS(ValueFlow::Value::ValueKind::Possible, value.valueKind);
ASSERT(value.isPossible());
}
};