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

Clarify code with Token::hasKnownValue()

This commit is contained in:
Daniel Marjamäki 2018-07-14 13:09:53 +02:00
parent d00e522856
commit d603a811bb
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/valueflow.cpp
View File

@ -387,7 +387,7 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value, const Setti
else if (parent->str() == "?" && tok->str() == ":" && tok == parent->astOperand2() && parent->astOperand1()) { else if (parent->str() == "?" && tok->str() == ":" && tok == parent->astOperand2() && parent->astOperand1()) {
// is condition always true/false? // is condition always true/false?
if (parent->astOperand1()->values().size() == 1U && parent->astOperand1()->values().front().isKnown()) { if (parent->astOperand1()->hasKnownValue()) {
const ValueFlow::Value &condvalue = parent->astOperand1()->values().front(); const ValueFlow::Value &condvalue = parent->astOperand1()->values().front();
const bool cond(condvalue.isTokValue() || (condvalue.isIntValue() && condvalue.intvalue != 0)); const bool cond(condvalue.isTokValue() || (condvalue.isIntValue() && condvalue.intvalue != 0));
if (cond && !tok->astOperand1()) { // true condition, no second operator if (cond && !tok->astOperand1()) { // true condition, no second operator
@ -435,10 +435,8 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value, const Setti
else if ((parent->isArithmeticalOp() || parent->isComparisonOp() || (parent->tokType() == Token::eBitOp) || (parent->tokType() == Token::eLogicalOp)) && else if ((parent->isArithmeticalOp() || parent->isComparisonOp() || (parent->tokType() == Token::eBitOp) || (parent->tokType() == Token::eLogicalOp)) &&
parent->astOperand1() && parent->astOperand1() &&
parent->astOperand2()) { parent->astOperand2()) {
const bool known = ((parent->astOperand1()->values().size() == 1U && const bool known = (parent->astOperand1()->hasKnownValue() ||
parent->astOperand1()->values().front().isKnown()) || parent->astOperand2()->hasKnownValue());
(parent->astOperand2()->values().size() == 1U &&
parent->astOperand2()->values().front().isKnown()));
// known result when a operand is 0. // known result when a operand is 0.
if (Token::Match(parent, "[&*]") && value.isKnown() && value.isIntValue() && value.intvalue==0) { if (Token::Match(parent, "[&*]") && value.isKnown() && value.isIntValue() && value.intvalue==0) {
@ -1003,7 +1001,7 @@ static void valueFlowBitAnd(TokenList *tokenlist)
if (tok->str() != "&") if (tok->str() != "&")
continue; continue;
if (tok->values().size() == 1U && tok->values().front().isKnown()) if (tok->hasKnownValue())
continue; continue;
if (!tok->astOperand1() || !tok->astOperand2()) if (!tok->astOperand1() || !tok->astOperand2())
@ -3457,7 +3455,7 @@ const ValueFlow::Value *ValueFlow::valueFlowConstantFoldAST(const Token *expr, c
valueFlowConstantFoldAST(expr->astOperand2(), settings); valueFlowConstantFoldAST(expr->astOperand2(), settings);
valueFlowSetConstantValue(expr, settings, true /* TODO: this is a guess */); valueFlowSetConstantValue(expr, settings, true /* TODO: this is a guess */);
} }
return expr && expr->values().size() == 1U && expr->values().front().isKnown() ? &expr->values().front() : nullptr; return expr && expr->hasKnownValue() ? &expr->values().front() : nullptr;
} }