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

ValueFlow: Refactoring valueFlowCallFunction

This commit is contained in:
Daniel Marjamäki 2018-11-06 06:38:26 +01:00
parent 1244213d2e
commit 00340efc57
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/valueflow.cpp
View File

@ -3439,11 +3439,25 @@ static bool evaluate(const Token *expr, const std::vector<std::list<ValueFlow::V
return false;
}
static std::list<ValueFlow::Value> getFunctionArgumentValues(const Token *argtok)
{
std::list<ValueFlow::Value> argvalues(argtok->values());
if (argvalues.empty()) {
if (Token::Match(argtok, "%comp%|%oror%|&&|!")) {
argvalues.emplace_back(0);
argvalues.emplace_back(1);
} else {
argvalues = argtok->values();
}
}
return argvalues;
}
static void valueFlowLibraryFunction(Token *tok, const std::string &returnValue, const Settings *settings)
{
std::vector<std::list<ValueFlow::Value>> argValues;
for (const Token *argtok : getArguments(tok->previous())) {
argValues.emplace_back(argtok->values());
argValues.emplace_back(getFunctionArgumentValues(argtok));
if (argValues.back().empty())
return;
}
@ -3509,30 +3523,24 @@ static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger,
break;
// passing value(s) to function
std::list<ValueFlow::Value> argvalues;
if (Token::Match(argtok, "%comp%|%oror%|&&|!") && !argtok->hasKnownIntValue()) {
argvalues.emplace_back(0);
argvalues.emplace_back(1);
} else {
argvalues = argtok->values();
}
std::list<ValueFlow::Value> argvalues(getFunctionArgumentValues(argtok));
if (argvalues.empty())
continue;
// Error path..
for (std::list<ValueFlow::Value>::iterator it = argvalues.begin(); it != argvalues.end(); ++it) {
for (ValueFlow::Value &v : argvalues) {
const std::string nr = MathLib::toString(argnr + 1) + getOrdinalText(argnr + 1);
it->errorPath.emplace_back(argtok,
"Calling function '" +
calledFunction->name() +
"', " +
nr +
" argument '" +
argvar->name() +
"' value is " +
it->infoString());
v.errorPath.emplace_back(argtok,
"Calling function '" +
calledFunction->name() +
"', " +
nr +
" argument '" +
argtok->expressionString() +
"' value is " +
v.infoString());
}
// passed values are not "known"..

2
test/testvalueflow.cpp
View File

@ -876,7 +876,7 @@ private:
" f1(x+1);\n"
"}\n";
ASSERT_EQUALS("5,Assignment 'x=3', assigned value is 3\n"
"6,Calling function 'f1', 1st argument 'x' value is 4\n",
"6,Calling function 'f1', 1st argument 'x+1' value is 4\n",
getErrorPathForX(code, 2U));
code = "void f(int a) {\n"