Skip to content

Partial fix for #8433 FN unusedVariable not detected when there is lambda (regression) #6685

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
orbitcowboy merged 6 commits into from
Aug 12, 2024
Merged

Partial fix for #8433 FN unusedVariable not detected when there is lambda (regression) #6685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9630a6e
Update testunusedvar.cpp
chrchr-github Aug 12, 2024
b6bab68
Update symboldatabase.h
chrchr-github Aug 12, 2024
4c13af4
Update symboldatabase.cpp
chrchr-github Aug 12, 2024
2312ecc
Update checkunusedvar.cpp
chrchr-github Aug 12, 2024
450abf8
Update testunusedvar.cpp
chrchr-github Aug 12, 2024
b4b7807
Update checkunusedvar.cpp
chrchr-github Aug 12, 2024
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
11 changes: 9 additions & 2 deletions lib/checkunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,8 +1183,8 @@ void CheckUnusedVar::checkFunctionVariableUsage()
for (const Scope * scope : symbolDatabase->functionScopes) {
// Bailout when there are lambdas or inline functions
// TODO: Handle lambdas and inline functions properly
if (scope->hasInlineOrLambdaFunction())
continue;
const Token* lambdaOrInlineStart{};
const bool hasLambdaOrInline = scope->hasInlineOrLambdaFunction(&lambdaOrInlineStart);

for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
if (findLambdaEndToken(tok))
Expand Down Expand Up @@ -1264,6 +1264,13 @@ void CheckUnusedVar::checkFunctionVariableUsage()
const Variable *op1Var = op1tok ? op1tok->variable() : nullptr;
if (!op1Var && Token::Match(tok, "(|{") && tok->previous() && tok->previous()->variable())
op1Var = tok->previous()->variable();
if (hasLambdaOrInline) {
if (!op1Var || !lambdaOrInlineStart)
continue;
if (precedes(op1Var->nameToken(), lambdaOrInlineStart))
continue;
}

std::string bailoutTypeName;
if (op1Var) {
if (op1Var->isReference() && op1Var->nameToken() != tok->astOperand1())
Expand Down
14 changes: 10 additions & 4 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5514,16 +5514,22 @@ static bool hasEmptyCaptureList(const Token* tok) {
return Token::simpleMatch(listTok, "[ ]");
}

bool Scope::hasInlineOrLambdaFunction() const
bool Scope::hasInlineOrLambdaFunction(const Token** tokStart) const
{
return std::any_of(nestedList.begin(), nestedList.end(), [&](const Scope* s) {
// Inline function
if (s->type == Scope::eUnconditional && Token::simpleMatch(s->bodyStart->previous(), ") {"))
if (s->type == Scope::eUnconditional && Token::simpleMatch(s->bodyStart->previous(), ") {")) {
if (tokStart)
*tokStart = nullptr; // bailout for e.g. loop-like macros
return true;
}
// Lambda function
if (s->type == Scope::eLambda && !hasEmptyCaptureList(s->bodyStart))
if (s->type == Scope::eLambda && !hasEmptyCaptureList(s->bodyStart)) {
if (tokStart)
*tokStart = s->bodyStart;
return true;
if (s->hasInlineOrLambdaFunction())
}
if (s->hasInlineOrLambdaFunction(tokStart))
return true;
return false;
});
Expand Down
2 changes: 1 addition & 1 deletion lib/symboldatabase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@ class CPPCHECKLIB Scope {
}

// Is there lambda/inline function(s) in this scope?
bool hasInlineOrLambdaFunction() const;
bool hasInlineOrLambdaFunction(const Token** tokStart = nullptr) const;

/**
* @brief find a function
Expand Down
7 changes: 7 additions & 0 deletions test/testunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6980,6 +6980,13 @@ class TestUnusedVar : public TestFixture {
" std::for_each(ints.begin(), ints.end(), [&x](int i){ x += i; });\n"
"}");
TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'x' is assigned a value that is never used.\n", "", errout_str());

functionVariableUsage("int f(const std::vector<int>& v) {\n"
" auto it = std::find_if(v.begin(), v.end(), [&](int i) { return i > 0 && i < 7; });\n"
" std::unordered_map<std::string, std::vector<int*>> exprs;\n"
" return *it;\n"
"}");
ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: exprs\n", errout_str());
}

void namespaces() { // #7557
Expand Down