missingReturn; Fixed FP when function is declared in macro

nomick · Jul 8, 2021 · ef0af26 · ef0af26
1 parent 4ecf3cc
commit ef0af26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
@@ -259,7 +259,7 @@ void CheckFunctions::checkMissingReturn()
             continue;
         if (function->type != Function::Type::eFunction && function->type != Function::Type::eOperatorEqual)
             continue;
-        if (Token::Match(function->retDef, "void %name%"))
+        if (Token::Match(function->retDef, "void| %name% ("))
             continue;
         const Token *errorToken = checkMissingReturnScope(scope->bodyEnd);
         if (errorToken)

diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
@@ -1373,6 +1373,9 @@ class TestFunctions : public TestFixture {
         check("int f() {}");
         ASSERT_EQUALS("[test.cpp:1]: (error) Found a exit path from function with non-void return type that has missing return statement\n", errout.str());
 
+        check("F(A,B) { x=1; }");
+        ASSERT_EQUALS("", errout.str());
+
         // switch
         check("int f() {\n"
               "    switch (x) {\n"