walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

missingReturn; Improved handling of noreturn function

This commit is contained in:
Daniel Marjamäki 2021-07-10 08:59:01 +02:00
parent 53955b48d2
commit a8fb0309fd
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/checkfunctions.cpp
View File

@ -248,7 +248,7 @@ void CheckFunctions::ignoredReturnErrorCode(const Token* tok, const std::string&
//---------------------------------------------------------------------------
// Check for ignored return values.
//---------------------------------------------------------------------------
static const Token *checkMissingReturnScope(const Token *tok);
static const Token *checkMissingReturnScope(const Token *tok, const Library &library);
void CheckFunctions::checkMissingReturn()
{
@ -263,13 +263,13 @@ void CheckFunctions::checkMissingReturn()
continue;
if (Function::returnsVoid(function, true))
continue;
const Token *errorToken = checkMissingReturnScope(scope->bodyEnd);
const Token *errorToken = checkMissingReturnScope(scope->bodyEnd, mSettings->library);
if (errorToken)
missingReturnError(errorToken);
}
}
static const Token *checkMissingReturnScope(const Token *tok)
static const Token *checkMissingReturnScope(const Token *tok, const Library &library)
{
const Token *lastStatement = nullptr;
while ((tok = tok->previous()) != nullptr) {
@ -289,6 +289,8 @@ static const Token *checkMissingReturnScope(const Token *tok)
return switchToken;
if (switchToken->isKeyword() && Token::Match(switchToken, "return|throw"))
reachable = false;
if (Token::Match(switchToken, "%name% (") && library.isnoreturn(switchToken))
reachable = false;
if (Token::Match(switchToken, "case|default"))
reachable = true;
if (Token::simpleMatch(switchToken, "default :"))
@ -301,12 +303,12 @@ static const Token *checkMissingReturnScope(const Token *tok)
} else if (tok->scope()->type == Scope::ScopeType::eIf) {
return tok;
} else if (tok->scope()->type == Scope::ScopeType::eElse) {
const Token *errorToken = checkMissingReturnScope(tok);
const Token *errorToken = checkMissingReturnScope(tok, library);
if (errorToken)
return errorToken;
tok = tok->link();
if (Token::simpleMatch(tok->tokAt(-2), "} else {"))
return checkMissingReturnScope(tok->tokAt(-2));
return checkMissingReturnScope(tok->tokAt(-2), library);
return tok;
}
// FIXME
@ -314,6 +316,8 @@ static const Token *checkMissingReturnScope(const Token *tok)
}
if (tok->isKeyword() && Token::Match(tok, "return|throw"))
return nullptr;
if (Token::Match(tok, "%name% (") && library.isnoreturn(tok))
return nullptr;
if (Token::Match(tok, "[;{}] %name% :"))
return tok;
if (Token::Match(tok, "; !!}") && !lastStatement)

4
test/testfunctions.cpp
View File

@ -1443,6 +1443,10 @@ private:
" return {1, 2};\n"
"}");
ASSERT_EQUALS("", errout.str());
// noreturn function
check("int f(int x) { exit(0); }");
ASSERT_EQUALS("", errout.str());
}
// NRVO check
void returnLocalStdMove1() {