Skip to content

valueflow.cpp: pass ProgramMemory by reference to valueFlowForLoop2() #8488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
firewave wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −10
Open

valueflow.cpp: pass ProgramMemory by reference to valueFlowForLoop2() #8488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions lib/valueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5163,9 +5163,9 @@ struct SymbolicConditionHandler : SimpleConditionHandler {
};

static bool valueFlowForLoop2(const Token *tok,
ProgramMemory *memory1,
ProgramMemory *memory2,
ProgramMemory *memoryAfter,
ProgramMemory &memory1,
ProgramMemory &memory2,
ProgramMemory &memoryAfter,
const Settings& settings)
{
// for ( firstExpression ; secondExpression ; thirdExpression )
Expand Down Expand Up @@ -5208,13 +5208,10 @@ static bool valueFlowForLoop2(const Token *tok,
}
// TODO: add bailout message

if (memory1)
memory1->swap(startMemory);
memory1.swap(startMemory);
if (!error) {
if (memory2)
memory2->swap(endMemory);
if (memoryAfter)
memoryAfter->swap(programMemory);
memory2.swap(endMemory);
memoryAfter.swap(programMemory);
}

return true;
Expand Down Expand Up @@ -5389,7 +5386,7 @@ static void valueFlowForLoop(const TokenList &tokenlist, const SymbolDatabase& s
valueFlowForLoopSimplifyAfter(tok, varid, afterValue, tokenlist, errorLogger, settings);
} else {
ProgramMemory mem1, mem2, memAfter;
if (valueFlowForLoop2(tok, &mem1, &mem2, &memAfter, settings)) {
if (valueFlowForLoop2(tok, mem1, mem2, memAfter, settings)) {
for (const auto& p : mem1) {
if (!p.second.isIntValue())
continue;
Expand Down
Loading