Skip to content

ValueFlow: added some early exits to avoid unnecessary object creations and copies #7753

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

Merged
firewave merged 3 commits into from
Aug 23, 2025
Merged

ValueFlow: added some early exits to avoid unnecessary object creations and copies #7753

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae7b70f
valueflow.cpp: do not create object until necessary in `LifetimeStore…
firewave Dec 25, 2024
bd10ed4
valueflow.cpp: exit early in `LifetimeStore::byVal()` to avoid unnece…
firewave Dec 25, 2024
612dae1
valueflow.cpp: avoid unnecessary object creation in `valueFlowFunctio…
firewave Jun 10, 2025
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
24 changes: 13 additions & 11 deletions lib/valueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2362,19 +2362,20 @@ struct LifetimeStore {
for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(argtok, settings)) {
if (!settings.certainty.isEnabled(Certainty::inconclusive) && lt.inconclusive)
continue;

const Variable* var = lt.token->variable();
if (!var || !var->isArgument())
continue;

ValueFlow::Value value;
value.valueType = ValueFlow::Value::ValueType::LIFETIME;
value.tokvalue = lt.token;
value.capturetok = argtok;
value.errorPath = er;
value.lifetimeKind = type;
value.setInconclusive(inconclusive || lt.inconclusive);
const Variable* var = lt.token->variable();
if (var && var->isArgument()) {
value.lifetimeScope = ValueFlow::Value::LifetimeScope::Argument;
} else {
continue;
}
value.lifetimeScope = ValueFlow::Value::LifetimeScope::Argument;

// Don't add the value a second time
if (std::find(tok->values().cbegin(), tok->values().cend(), value) != tok->values().cend())
continue;
Expand All @@ -2391,12 +2392,12 @@ struct LifetimeStore {
for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(tok3, settings)) {
if (!settings.certainty.isEnabled(Certainty::inconclusive) && lt.inconclusive)
continue;
ErrorPath er = v.errorPath;
er.insert(er.end(), lt.errorPath.cbegin(), lt.errorPath.cend());
if (!lt.token)
return false;
if (!pred(lt.token))
return false;
ErrorPath er = v.errorPath;
er.insert(er.end(), lt.errorPath.cbegin(), lt.errorPath.cend());
er.emplace_back(argtok, message);
er.insert(er.end(), errorPath.cbegin(), errorPath.cend());

Expand Down Expand Up @@ -5889,11 +5890,12 @@ static void valueFlowFunctionDefaultParameter(const TokenList& tokenlist, const
const std::list<ValueFlow::Value> &values = var->nameToken()->tokAt(2)->values();
std::list<ValueFlow::Value> argvalues;
for (const ValueFlow::Value &value : values) {
if (!value.isKnown())
continue;
ValueFlow::Value v(value);
v.defaultArg = true;
v.changeKnownToPossible();
if (v.isPossible())
argvalues.push_back(std::move(v));
v.setPossible();
argvalues.push_back(std::move(v));
}
if (!argvalues.empty())
valueFlowInjectParameter(tokenlist, errorLogger, settings, var, scope, argvalues);
Expand Down
Loading