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

Removed missingReturn inconclusive warnings, that was too noisy

This commit is contained in:
Daniel Marjamäki 2021-09-01 19:49:53 +02:00
parent 4296859c1a
commit dccebb98ea
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/checkfunctions.cpp
View File

@ -252,7 +252,6 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
void CheckFunctions::checkMissingReturn() void CheckFunctions::checkMissingReturn()
{ {
const bool inconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase(); const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
for (const Scope *scope : symbolDatabase->functionScopes) { for (const Scope *scope : symbolDatabase->functionScopes) {
const Function *function = scope->function; const Function *function = scope->function;
@ -267,20 +266,8 @@ void CheckFunctions::checkMissingReturn()
if (Function::returnsVoid(function, true)) if (Function::returnsVoid(function, true))
continue; continue;
const Token *errorToken = checkMissingReturnScope(scope->bodyEnd, mSettings->library); const Token *errorToken = checkMissingReturnScope(scope->bodyEnd, mSettings->library);
if (errorToken) { if (errorToken)
missingReturnError(errorToken); missingReturnError(errorToken);
continue;
}
if (inconclusive && Token::simpleMatch(scope->bodyEnd->tokAt(-2), ") ; }")) {
const Token *ftok = scope->bodyEnd->linkAt(-2)->previous();
if (mSettings->library.isNotLibraryFunction(ftok)) {
const Token *tok = ftok;
while (Token::Match(tok->tokAt(-2), "%name% :: %name%"))
tok = tok->tokAt(-2);
if (Token::Match(tok->previous(), "[;{}] %name% (|::") && !tok->isKeyword())
missingReturnError(tok, Certainty::inconclusive);
}
}
} }
} }
@ -366,10 +353,10 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
return nullptr; return nullptr;
} }
void CheckFunctions::missingReturnError(const Token* tok, Certainty::CertaintyLevel certainty) void CheckFunctions::missingReturnError(const Token* tok)
{ {
reportError(tok, Severity::error, "missingReturn", reportError(tok, Severity::error, "missingReturn",
"Found a exit path from function with non-void return type that has missing return statement", CWE758, certainty); "Found a exit path from function with non-void return type that has missing return statement", CWE758, Certainty::normal);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Detect passing wrong values to <cmath> functions like atan(0, x); // Detect passing wrong values to <cmath> functions like atan(0, x);

2
lib/checkfunctions.h
View File

@ -120,7 +120,7 @@ private:
void memsetZeroBytesError(const Token *tok); void memsetZeroBytesError(const Token *tok);
void memsetFloatError(const Token *tok, const std::string &var_value); void memsetFloatError(const Token *tok, const std::string &var_value);
void memsetValueOutOfRangeError(const Token *tok, const std::string &value); void memsetValueOutOfRangeError(const Token *tok, const std::string &value);
void missingReturnError(const Token *tok, Certainty::CertaintyLevel certainty=Certainty::normal); void missingReturnError(const Token *tok);
void copyElisionError(const Token *tok); void copyElisionError(const Token *tok);
void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const OVERRIDE { void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const OVERRIDE {

3
test/testfunctions.cpp
View File

@ -1493,9 +1493,6 @@ private:
check("int f(int x) { assert(0); }"); check("int f(int x) { assert(0); }");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("int f(int x) { RETURN(0); }");
ASSERT_EQUALS("[test.cpp:1]: (error, inconclusive) Found a exit path from function with non-void return type that has missing return statement\n", errout.str());
} }
// NRVO check // NRVO check