Skip to content

checkstl.cpp: small LoopAnalyzer cleanup #8659

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 5 commits into
base: main
Choose a base branch
from
+47 −50
Open

checkstl.cpp: small LoopAnalyzer cleanup #8659

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d379b1
checkstl.cpp: pass `Settings` by reference
firewave Jun 16, 2026
d5f61d0
checkstl.cpp: cleaned up `LoopAnalyzer` access
firewave Jun 18, 2026
a01d966
checkstl.cpp: fixed `naming-privateMemberVariable` selfcheck warnings
firewave Jun 18, 2026
0d84dbd
checkstl.cpp: removed unnessary condition from `LoopAnalyzer::findAlg…
firewave Jun 18, 2026
ec0b1c3
checkstl.cpp: small `LoopAnalyzer::findAlgo()` cleanup
firewave Jun 18, 2026
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
97 changes: 47 additions & 50 deletions lib/checkstl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2867,38 +2867,37 @@ static bool isTernaryAssignment(const Token* assignTok, nonneg int loopVarId, no

namespace {
struct LoopAnalyzer {
const Token* bodyTok = nullptr;
const Token* loopVar = nullptr;
const Settings* settings = nullptr;
std::set<nonneg int> varsChanged;

explicit LoopAnalyzer(const Token* tok, const Settings* psettings)
: bodyTok(tok->linkAt(1)->next()), settings(psettings)
private:
const Token* mBodyTok;
const Token* mLoopVar{};
const Settings& mSettings;
std::set<nonneg int> mVarsChanged;

public:
explicit LoopAnalyzer(const Token* tok, const Settings& psettings)
: mBodyTok(tok->linkAt(1)->next()), mSettings(psettings)
{
const Token* splitTok = tok->next()->astOperand2();
if (Token::simpleMatch(splitTok, ":") && splitTok->previous()->varId() != 0) {
loopVar = splitTok->previous();
mLoopVar = splitTok->previous();
}
if (valid()) {
findChangedVariables();
}
}
bool isLoopVarChanged() const {
return varsChanged.count(loopVar->varId()) > 0;
}

private:
bool isModified(const Token* tok) const
{
if (tok->variable() && tok->variable()->isConst())
return false;
int n = 1 + (astIsPointer(tok) ? 1 : 0);
for (int i = 0; i < n; i++) {
bool inconclusive = false;
if (isVariableChangedByFunctionCall(tok, i, *settings, &inconclusive))
if (isVariableChangedByFunctionCall(tok, i, mSettings, &inconclusive))
return true;
if (inconclusive)
return true;
if (isVariableChanged(tok, i, *settings))
if (isVariableChanged(tok, i, mSettings))
return true;
}
return false;
Expand All @@ -2907,7 +2906,7 @@ namespace {
template<class Predicate, class F>
void findTokens(Predicate pred, F f) const
{
for (const Token* tok = bodyTok; precedes(tok, bodyTok->link()); tok = tok->next()) {
for (const Token* tok = mBodyTok; precedes(tok, mBodyTok->link()); tok = tok->next()) {
if (pred(tok))
f(tok);
}
Expand All @@ -2916,7 +2915,7 @@ namespace {
template<class Predicate>
const Token* findToken(Predicate pred) const
{
for (const Token* tok = bodyTok; precedes(tok, bodyTok->link()); tok = tok->next()) {
for (const Token* tok = mBodyTok; precedes(tok, mBodyTok->link()); tok = tok->next()) {
if (pred(tok))
return tok;
}
Expand All @@ -2931,58 +2930,56 @@ namespace {
}

bool valid() const {
return bodyTok && loopVar;
return mBodyTok && mLoopVar;
}

public:
std::string findAlgo() const
{
if (!valid())
return "";
bool loopVarChanged = isLoopVarChanged();
if (!loopVarChanged && varsChanged.empty()) {
if (hasGotoOrBreak())
return "";
bool alwaysTrue = true;
bool alwaysFalse = true;
auto hasReturn = [](const Token* tok) {
return Token::simpleMatch(tok, "return");
};
findTokens(hasReturn, [&](const Token* tok) {
const Token* returnTok = tok->astOperand1();
if (!returnTok || !returnTok->hasKnownIntValue() || !astIsBool(returnTok)) {
alwaysTrue = false;
alwaysFalse = false;
return;
}
(returnTok->getKnownIntValue() ? alwaysTrue : alwaysFalse) &= true;
(returnTok->getKnownIntValue() ? alwaysFalse : alwaysTrue) &= false;
});
if (alwaysTrue == alwaysFalse)
return "";
if (alwaysTrue)
return "std::any_of";
return "std::all_of or std::none_of";
}
return "";
if (!mVarsChanged.empty())
return "";
if (hasGotoOrBreak())
return "";
bool alwaysTrue = true;
bool alwaysFalse = true;
const auto hasReturn = [](const Token* tok) {
return Token::simpleMatch(tok, "return");
};
findTokens(hasReturn, [&](const Token* tok) {
const Token* returnTok = tok->astOperand1();
if (!returnTok || !returnTok->hasKnownIntValue() || !astIsBool(returnTok)) {
alwaysTrue = false;
alwaysFalse = false;
return;
}
(returnTok->getKnownIntValue() ? alwaysTrue : alwaysFalse) &= true;
(returnTok->getKnownIntValue() ? alwaysFalse : alwaysTrue) &= false;
});
if (alwaysTrue == alwaysFalse)
return "";
if (alwaysTrue)
return "std::any_of";
return "std::all_of or std::none_of";
}

private:
bool isLocalVar(const Variable* var) const
{
if (!var)
return false;
if (var->isPointer() || var->isReference())
return false;
if (var->declarationId() == loopVar->varId())
if (var->declarationId() == mLoopVar->varId())
return false;
const Scope* scope = var->scope();
return scope && scope->isNestedIn(bodyTok->scope());
return scope && scope->isNestedIn(mBodyTok->scope());
}

private:
void findChangedVariables()
{
std::set<nonneg int> vars;
for (const Token* tok = bodyTok; precedes(tok, bodyTok->link()); tok = tok->next()) {
for (const Token* tok = mBodyTok; precedes(tok, mBodyTok->link()); tok = tok->next()) {
if (tok->varId() == 0)
continue;
if (vars.count(tok->varId()) > 0)
Expand All @@ -2993,7 +2990,7 @@ namespace {
}
if (!isModified(tok))
continue;
varsChanged.insert(tok->varId());
mVarsChanged.insert(tok->varId());
vars.insert(tok->varId());
}
}
Expand Down Expand Up @@ -3044,7 +3041,7 @@ void CheckStlImpl::useStlAlgorithm()
continue;
if (!Token::simpleMatch(tok->linkAt(1), ") {"))
continue;
LoopAnalyzer a{tok, &mSettings};
LoopAnalyzer a{tok, mSettings};
std::string algoName = a.findAlgo();
if (!algoName.empty()) {
useStlAlgorithmError(tok, algoName);
Expand Down
Loading