missing return; fixed false positive for 'return {};'

lib/checkfunctions.cpp

@@ -274,6 +274,10 @@ static const Token *checkMissingReturnScope(const Token *tok)
         if (tok->str() == "{")
             return tok->next();
         if (tok->str() == "}") {
+            for (const Token *prev = tok->link()->previous(); prev && prev->scope() == tok->scope() && !Token::Match(prev, "[;{}]"); prev = prev->previous()) {
+                if (prev->isKeyword() && Token::Match(prev, "return|throw"))
+                    return nullptr;
+            }
             if (tok->scope()->type == Scope::ScopeType::eSwitch) {
                 // find break/default
                 bool hasDefault = false;

test/testfunctions.cpp

@@ -1397,6 +1397,15 @@ private:
               "    }\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        // return {..}
+        check("std::pair<int, int> typeDecl(int tok) {\n"
+              "    if (!tok)\n"
+              "        return {};\n"
+              "    else\n"
+              "        return {1, 2};\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 };