Skip to content

Fix #13472, #13516 FP unreachableCode (GNU inline function, custom loop macro) #7199

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 5 commits into from
Jan 10, 2025
Merged

Fix #13472, #13516 FP unreachableCode (GNU inline function, custom loop macro) #7199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e26defb
Update symboldatabase.h
chrchr-github Jan 9, 2025
2dee16d
Update symboldatabase.cpp
chrchr-github Jan 9, 2025
ae96d1c
Update checkother.cpp
chrchr-github Jan 9, 2025
fce62b8
Update testother.cpp
chrchr-github Jan 9, 2025
a0a05f3
Update testother.cpp
chrchr-github Jan 9, 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
2 changes: 2 additions & 0 deletions lib/checkother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,8 @@ void CheckOther::checkUnreachableCode()
const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
for (const Scope * scope : symbolDatabase->functionScopes) {
if (scope->hasInlineOrLambdaFunction(nullptr, /*onlyInline*/ true))
continue;
for (const Token* tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
const Token* secondBreak = nullptr;
const Token* labelName = nullptr;
Expand Down
6 changes: 3 additions & 3 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5520,7 +5520,7 @@ static bool hasEmptyCaptureList(const Token* tok) {
return Token::simpleMatch(listTok, "[ ]");
}

bool Scope::hasInlineOrLambdaFunction(const Token** tokStart) const
bool Scope::hasInlineOrLambdaFunction(const Token** tokStart, bool onlyInline) const
{
return std::any_of(nestedList.begin(), nestedList.end(), [&](const Scope* s) {
// Inline function
Expand All @@ -5530,12 +5530,12 @@ bool Scope::hasInlineOrLambdaFunction(const Token** tokStart) const
return true;
}
// Lambda function
if (s->type == Scope::eLambda && !hasEmptyCaptureList(s->bodyStart)) {
if (!onlyInline && s->type == Scope::eLambda && !hasEmptyCaptureList(s->bodyStart)) {
if (tokStart)
*tokStart = s->bodyStart;
return true;
}
if (s->hasInlineOrLambdaFunction(tokStart))
if (s->hasInlineOrLambdaFunction(tokStart, onlyInline))
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 @@ -1132,7 +1132,7 @@ class CPPCHECKLIB Scope {
}

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

/**
* @brief find a function
Expand Down
21 changes: 21 additions & 0 deletions test/testother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5724,6 +5724,27 @@ class TestOther : public TestFixture {
" return 3;\n"
"}\n");
TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Statements following 'return' will never be executed.\n", "", errout_str());

check("int f() {\n" // #13472
" int var;\n"
" auto int ret();\n"
" int ret() {\n"
" return var;\n"
" }\n"
" var = 42;\n"
" return ret();\n"
"}\n", /*cpp*/ false);
ASSERT_EQUALS("", errout_str());

check("void f() {\n" // #13516
" io_uring_for_each_cqe(&ring, head, cqe) {\n"
" if (cqe->res == -EOPNOTSUPP)\n"
" printf(\"error\");\n"
" goto ok;\n"
" }\n"
" usleep(10000);\n"
"}\n");
ASSERT_EQUALS("", errout_str());
}

void redundantContinue() {
Expand Down
Loading