Skip to content

[Refactor] Redundant checks for noreturn functions #8712

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 7 commits into from
Jul 11, 2026
+11 −25
Merged

[Refactor] Redundant checks for noreturn functions #8712

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23b092c
Update astutils.cpp
chrchr-github Jul 10, 2026
b9e555b
Update checkother.cpp
chrchr-github Jul 10, 2026
8537acb
Update astutils.cpp
chrchr-github Jul 10, 2026
1766444
Update astutils.cpp
chrchr-github Jul 10, 2026
84b6d87
Update astutils.cpp
chrchr-github Jul 10, 2026
73e3eb3
Update astutils.cpp
chrchr-github Jul 10, 2026
86b2e64
Update astutils.cpp
chrchr-github Jul 10, 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
33 changes: 10 additions & 23 deletions lib/astutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2226,23 +2226,19 @@
return Token::Match(tok, "return|goto|throw|continue|break");
}

static bool isNoreturnFunction(const Token* ftok, const Library& library)
{
if (const Function* function = ftok->function())
return function->isEscapeFunction() || function->isAttributeNoreturn();
}
return library.isnoreturn(ftok));

Check failure

Code scanning / Cppcheck Premium

Unmatched ')'. Configuration: 'GNUC=1;CPPCHECK=1'. Error

Unmatched ')'. Configuration: '__GNUC__=1;__CPPCHECK__=1'.
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed
}

bool isEscapeFunction(const Token* ftok, const Library& library)
{
if (!Token::Match(ftok, "%name% ("))
return false;
if (Token::Match(ftok, "exit|abort"))
return true;
const Function* function = ftok->function();
if (function) {
if (function->isEscapeFunction())
return true;
if (function->isAttributeNoreturn())
return true;
} else {
if (library.isnoreturn(ftok))
return true;
}
return false;
return isNoreturnFunction(ftok, library);
}

static bool hasNoreturnFunction(const Token* tok, const Library& library, const Token** unknownFunc)
Expand All @@ -2253,17 +2249,8 @@
while (Token::simpleMatch(ftok, "("))
ftok = ftok->astOperand1();
if (ftok) {
const Function * function = ftok->function();
if (function) {
if (function->isEscapeFunction())
return true;
if (function->isAttributeNoreturn())
return true;
} else if (library.isnoreturn(ftok)) {
return true;
} else if (Token::Match(ftok, "exit|abort")) {
if (isNoreturnFunction(ftok, library))
return true;
}
if (unknownFunc && !function && library.functions().count(library.getFunctionName(ftok)) == 0)
*unknownFunc = ftok;
return false;
Expand Down
2 changes: 1 addition & 1 deletion lib/checkother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ void CheckOtherImpl::redundantAssignmentSameValueError(const Token *tok, const V
//---------------------------------------------------------------------------
static inline bool isFunctionOrBreakPattern(const Token *tok)
{
return Token::Match(tok, "%name% (") || Token::Match(tok, "break|continue|return|exit|goto|throw");
return Token::Match(tok, "%name% (") || (tok->isKeyword() && Token::Match(tok, "break|continue|return|goto|throw"));
}

void CheckOtherImpl::redundantBitwiseOperationInSwitchError()
Expand Down
Loading