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

ValueFlow: For convenience, return constant folded value

This commit is contained in:
Daniel Marjamäki 2016-05-08 11:17:10 +02:00
parent b26dd1ccab
commit b94eaeca6a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/valueflow.cpp
View File

@ -2377,13 +2377,14 @@ static void valueFlowFunctionReturn(TokenList *tokenlist, ErrorLogger *errorLogg
} }
} }
void ValueFlow::valueFlowConstantFoldAST(const Token *expr) const ValueFlow::Value *ValueFlow::valueFlowConstantFoldAST(const Token *expr)
{ {
if (!expr || !expr->values.empty()) if (expr && expr->values.empty()) {
return; valueFlowConstantFoldAST(expr->astOperand1());
valueFlowConstantFoldAST(expr->astOperand1()); valueFlowConstantFoldAST(expr->astOperand2());
valueFlowConstantFoldAST(expr->astOperand2()); valueFlowSetConstantValue(expr);
valueFlowSetConstantValue(expr); }
return expr && expr->values.size() == 1U && expr->values.front().isKnown() ? &expr->values.front() : nullptr;
} }

2
lib/valueflow.h
View File

@ -95,7 +95,7 @@ namespace ValueFlow {
}; };
/// Constant folding of expression. This can be used before the full ValueFlow has been executed (ValueFlow::setValues). /// Constant folding of expression. This can be used before the full ValueFlow has been executed (ValueFlow::setValues).
void valueFlowConstantFoldAST(const Token *expr); const ValueFlow::Value * valueFlowConstantFoldAST(const Token *expr);
/// Perform valueflow analysis. /// Perform valueflow analysis.
void setValues(TokenList *tokenlist, SymbolDatabase* symboldatabase, ErrorLogger *errorLogger, const Settings *settings); void setValues(TokenList *tokenlist, SymbolDatabase* symboldatabase, ErrorLogger *errorLogger, const Settings *settings);