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

Pass settings to isVariableChanged() (#4871)

This commit is contained in:
chrchr-github 2023-03-09 20:05:44 +01:00 committed by GitHub
parent 49c5a5aabd
commit 3db05cf3a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/programmemory.cpp
View File

@ -334,7 +334,7 @@ static void fillProgramMemoryFromConditions(ProgramMemory& pm, const Token* tok,
fillProgramMemoryFromConditions(pm, tok->scope(), tok, settings); fillProgramMemoryFromConditions(pm, tok->scope(), tok, settings);
} }
static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok, const ProgramMemory& state, const ProgramMemory::Map& vars) static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok, const Settings* settings, const ProgramMemory& state, const ProgramMemory::Map& vars)
{ {
int indentlevel = 0; int indentlevel = 0;
for (const Token *tok2 = tok; tok2; tok2 = tok2->previous()) { for (const Token *tok2 = tok; tok2; tok2 = tok2->previous()) {
@ -357,7 +357,7 @@ static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok
} }
} }
} else if (tok2->exprId() > 0 && Token::Match(tok2, ".|(|[|*|%var%") && !pm.hasValue(tok2->exprId()) && } else if (tok2->exprId() > 0 && Token::Match(tok2, ".|(|[|*|%var%") && !pm.hasValue(tok2->exprId()) &&
isVariableChanged(tok2, 0, nullptr, true)) { isVariableChanged(tok2, 0, settings, true)) {
pm.setUnknown(tok2); pm.setUnknown(tok2);
} }
@ -403,13 +403,14 @@ static void removeModifiedVars(ProgramMemory& pm, const Token* tok, const Token*
static ProgramMemory getInitialProgramState(const Token* tok, static ProgramMemory getInitialProgramState(const Token* tok,
const Token* origin, const Token* origin,
const Settings* settings,
const ProgramMemory::Map& vars = ProgramMemory::Map {}) const ProgramMemory::Map& vars = ProgramMemory::Map {})
{ {
ProgramMemory pm; ProgramMemory pm;
if (origin) { if (origin) {
fillProgramMemoryFromConditions(pm, origin, nullptr); fillProgramMemoryFromConditions(pm, origin, nullptr);
const ProgramMemory state = pm; const ProgramMemory state = pm;
fillProgramMemoryFromAssignments(pm, tok, state, vars); fillProgramMemoryFromAssignments(pm, tok, settings, state, vars);
removeModifiedVars(pm, tok, origin); removeModifiedVars(pm, tok, origin);
} }
return pm; return pm;
@ -447,7 +448,7 @@ void ProgramMemoryState::addState(const Token* tok, const ProgramMemory::Map& va
addVars(pm, vars); addVars(pm, vars);
fillProgramMemoryFromConditions(pm, tok, settings); fillProgramMemoryFromConditions(pm, tok, settings);
ProgramMemory local = pm; ProgramMemory local = pm;
fillProgramMemoryFromAssignments(pm, tok, local, vars); fillProgramMemoryFromAssignments(pm, tok, settings, local, vars);
addVars(pm, vars); addVars(pm, vars);
replace(pm, tok); replace(pm, tok);
} }
@ -501,34 +502,15 @@ ProgramMemory ProgramMemoryState::get(const Token* tok, const Token* ctx, const
return local.state; return local.state;
} }
ProgramMemory getProgramMemory(const Token *tok, const ProgramMemory::Map& vars)
{
ProgramMemory programMemory;
for (const auto& p:vars) {
const ValueFlow::Value &value = p.second;
programMemory.replace(getInitialProgramState(tok, value.tokvalue));
programMemory.replace(getInitialProgramState(tok, value.condition));
}
fillProgramMemoryFromConditions(programMemory, tok, nullptr);
ProgramMemory state;
for (const auto& p:vars) {
const ValueFlow::Value &value = p.second;
programMemory.setValue(p.first.tok, value);
}
state = programMemory;
fillProgramMemoryFromAssignments(programMemory, tok, state, vars);
return programMemory;
}
ProgramMemory getProgramMemory(const Token* tok, const Token* expr, const ValueFlow::Value& value, const Settings* settings) ProgramMemory getProgramMemory(const Token* tok, const Token* expr, const ValueFlow::Value& value, const Settings* settings)
{ {
ProgramMemory programMemory; ProgramMemory programMemory;
programMemory.replace(getInitialProgramState(tok, value.tokvalue)); programMemory.replace(getInitialProgramState(tok, value.tokvalue, settings));
programMemory.replace(getInitialProgramState(tok, value.condition)); programMemory.replace(getInitialProgramState(tok, value.condition, settings));
fillProgramMemoryFromConditions(programMemory, tok, settings); fillProgramMemoryFromConditions(programMemory, tok, settings);
programMemory.setValue(expr, value); programMemory.setValue(expr, value);
const ProgramMemory state = programMemory; const ProgramMemory state = programMemory;
fillProgramMemoryFromAssignments(programMemory, tok, state, {{expr, value}}); fillProgramMemoryFromAssignments(programMemory, tok, settings, state, {{expr, value}});
return programMemory; return programMemory;
} }