Skip to content

Fix #9091 std::accumulate suggested instead of std::max_element #7316

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
chrchr-github merged 4 commits into from
Feb 25, 2025
Merged

Fix #9091 std::accumulate suggested instead of std::max_element #7316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d839bc3
Update teststl.cpp
chrchr-github Feb 21, 2025
f80fe08
Update checkstl.cpp
chrchr-github Feb 21, 2025
f9af4dd
Update checkstl.cpp
chrchr-github Feb 21, 2025
5281792
Add test
chrchr-github Feb 23, 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
32 changes: 28 additions & 4 deletions lib/checkstl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2899,10 +2899,21 @@ void CheckStl::useStlAlgorithm()
return !astIsContainer(tok); // don't warn for containers, where overloaded operators can be costly
};

auto isConditionWithoutSideEffects = [this](const Token* tok) -> bool {
enum class ConditionOpType : std::uint8_t { OTHER, MIN, MAX };
auto isConditionWithoutSideEffects = [this](const Token* tok, ConditionOpType& type) -> bool {
if (!Token::simpleMatch(tok, "{") || !Token::simpleMatch(tok->previous(), ")"))
return false;
return isConstExpression(tok->linkAt(-1)->astOperand2(), mSettings->library);
const Token* condTok = tok->linkAt(-1)->astOperand2();
if (isConstExpression(condTok, mSettings->library)) {
if (condTok->str() == "<")
type = ConditionOpType::MIN;
else if (condTok->str() == ">")
type = ConditionOpType::MAX;
else
type = ConditionOpType::OTHER;
return true;
}
return false;
};

auto isAccumulation = [](const Token* tok, int varId) {
Expand Down Expand Up @@ -3035,14 +3046,27 @@ void CheckStl::useStlAlgorithm()
else
algo = "std::replace_if";
} else {
ConditionOpType type{};
if (addByOne(assignTok, assignVarId))
algo = "std::count_if";
else if (accumulateBoolLiteral(assignTok, assignVarId))
algo = "std::any_of, std::all_of, std::none_of, or std::accumulate";
else if (assignTok->str() != "=")
algo = "std::accumulate";
else if (hasBreak && isConditionWithoutSideEffects(condBodyTok))
algo = "std::any_of, std::all_of, std::none_of";
else if (isConditionWithoutSideEffects(condBodyTok, type)) {
if (hasBreak)
algo = "std::any_of, std::all_of, std::none_of";
else if (assignTok->astOperand2()->varId() == loopVar->varId()) {
if (type == ConditionOpType::MIN)
algo = "std::min_element";
else if (type == ConditionOpType::MAX)
algo = "std::max_element";
else
continue;
}
else
continue;
}
else
continue;
}
Expand Down
17 changes: 13 additions & 4 deletions test/teststl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5859,17 +5859,26 @@ class TestStl : public TestFixture {
dinit(CheckOptions, $.inconclusive = true));
ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::accumulate algorithm instead of a raw loop.\n", errout_str());

check("void f(const std::vector<int>& v) {\n"
check("void f(const std::vector<int>& v) {\n" // #9091
" int maxY = 0;\n"
" for (int y : v) {\n"
" if (y > maxY)\n"
" maxY = y;\n"
" }\n"
"}\n",
dinit(CheckOptions, $.inconclusive = true));
TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Consider using std::max_element algorithm instead of a raw loop.\n",
"",
errout_str());
ASSERT_EQUALS("[test.cpp:5]: (style) Consider using std::max_element algorithm instead of a raw loop.\n", errout_str());

check("int f(const std::vector<int>& v) {\n"
" int minY = 0;\n"
" for (int y : v) {\n"
" if (y < minY)\n"
" minY = y;\n"
" }\n"
" return minY;\n"
"}\n",
dinit(CheckOptions, $.inconclusive = true));
ASSERT_EQUALS("[test.cpp:5]: (style) Consider using std::min_element algorithm instead of a raw loop.\n", errout_str());
}

void loopAlgoMultipleReturn()
Expand Down
Loading