Removed missingReturn inconclusive warnings, that was too noisy

danmar · danmar · commit dccebb98ea78 · 2021-09-01T19:50:17.000+02:00
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
@@ -252,7 +252,6 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
 
 void CheckFunctions::checkMissingReturn()
 {
-    const bool inconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         const Function *function = scope->function;
@@ -267,20 +266,8 @@ void CheckFunctions::checkMissingReturn()
         if (Function::returnsVoid(function, true))
             continue;
         const Token *errorToken = checkMissingReturnScope(scope->bodyEnd, mSettings->library);
-        if (errorToken) {
+        if (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;
 }
 
-void CheckFunctions::missingReturnError(const Token* tok, Certainty::CertaintyLevel certainty)
+void CheckFunctions::missingReturnError(const Token* tok)
 {
     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);
diff --git a/lib/checkfunctions.h b/lib/checkfunctions.h
@@ -120,7 +120,7 @@ class CPPCHECKLIB CheckFunctions : public Check {
     void memsetZeroBytesError(const Token *tok);
     void memsetFloatError(const Token *tok, const std::string &var_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 getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const OVERRIDE {
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
@@ -1493,9 +1493,6 @@ class TestFunctions : public TestFixture {
 
         check("int f(int x) { assert(0); }");
         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

Original file line number	Diff line number	Diff line change
`@@ -1493,9 +1493,6 @@ class TestFunctions : public TestFixture {`
`1493`	`1493`
`1494`	`1494`	`check("int f(int x) { assert(0); }");`
`1495`	`1495`	`ASSERT_EQUALS("", errout.str());`
`1496`		`-`
`1497`		`- check("int f(int x) { RETURN(0); }");`
`1498`		`- 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());`
`1499`	`1496`	`}`
`1500`	`1497`
`1501`	`1498`	`// NRVO check`