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

astyle formatting 

[ci skip]
This commit is contained in:
Daniel Marjamäki 2019-08-30 18:34:14 +02:00
parent 0b9e823fc8
commit 1a25d3f9ec
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/valueflow.cpp
View File

@ -2215,7 +2215,7 @@ static bool valueFlowForward(Token * const startToken,
// conditional block of code that assigns variable.. // conditional block of code that assigns variable..
else if (!tok2->varId() && Token::Match(tok2, "%name% (") && Token::simpleMatch(tok2->linkAt(1), ") {")) { else if (!tok2->varId() && Token::Match(tok2, "%name% (") && Token::simpleMatch(tok2->linkAt(1), ") {")) {
// is variable changed in condition? // is variable changed in condition?
for(int i:getIndirections(values)) { for (int i:getIndirections(values)) {
Token* tokChanged = findVariableChanged(tok2->next(), tok2->next()->link(), i, varid, var->isGlobal(), settings, tokenlist->isCPP()); Token* tokChanged = findVariableChanged(tok2->next(), tok2->next()->link(), i, varid, var->isGlobal(), settings, tokenlist->isCPP());
if (tokChanged != nullptr) { if (tokChanged != nullptr) {
// Set the value before bailing // Set the value before bailing
@ -2226,7 +2226,9 @@ static bool valueFlowForward(Token * const startToken,
setTokenValue(tokChanged, v, settings); setTokenValue(tokChanged, v, settings);
} }
} }
values.remove_if([&](const ValueFlow::Value& v) { return v.indirect == i; }); values.remove_if([&](const ValueFlow::Value& v) {
return v.indirect == i;
});
} }
} }
if (values.empty()) { if (values.empty()) {
@ -2748,10 +2750,12 @@ static bool valueFlowForward(Token * const startToken,
} }
// assigned by subfunction? // assigned by subfunction?
for(int i:getIndirections(values)) { for (int i:getIndirections(values)) {
bool inconclusive = false; bool inconclusive = false;
if (isVariableChangedByFunctionCall(tok2, i, settings, &inconclusive)) { if (isVariableChangedByFunctionCall(tok2, i, settings, &inconclusive)) {
values.remove_if([&](const ValueFlow::Value& v) { return v.indirect <= i; }); values.remove_if([&](const ValueFlow::Value& v) {
return v.indirect <= i;
});
} }
if (inconclusive) { if (inconclusive) {
for (ValueFlow::Value &v : values) { for (ValueFlow::Value &v : values) {
@ -2777,11 +2781,13 @@ static bool valueFlowForward(Token * const startToken,
} }
} }
// Variable changed // Variable changed
for(int i:getIndirections(values)) { for (int i:getIndirections(values)) {
// Remove unintialized values if modified // Remove unintialized values if modified
if (isVariableChanged(tok2, i, settings, tokenlist->isCPP())) if (isVariableChanged(tok2, i, settings, tokenlist->isCPP()))
values.remove_if([&](const ValueFlow::Value& v) { return v.isUninitValue() && v.indirect <= i; }); values.remove_if([&](const ValueFlow::Value& v) {
} return v.isUninitValue() && v.indirect <= i;
});
}
} else if (isAliasOf(var, tok2, varid, values) && isVariableChanged(tok2, 0, settings, tokenlist->isCPP())) { } else if (isAliasOf(var, tok2, varid, values) && isVariableChanged(tok2, 0, settings, tokenlist->isCPP())) {
if (settings->debugwarnings) if (settings->debugwarnings)
bailout(tokenlist, errorLogger, tok2, "Alias variable was modified."); bailout(tokenlist, errorLogger, tok2, "Alias variable was modified.");