handle templated return types

Author: ludviggunne

lib/tokenize.cpp

@@ -6568,12 +6568,23 @@ void Tokenizer::simplifyHeadersAndUnusedTemplates()
                     } else {
                         Token *funcTok = closingBracket->next();
                         while (funcTok) {
-                            if (Token::Match(funcTok, "constexpr|static|inline|const|%type%|&|&&|*") && !Token::Match(funcTok, "%name% (")) {
+                            if (Token::Match(funcTok, "::|constexpr|static|inline|const|%type%|&|&&|*") && !Token::Match(funcTok, "%name% (")) {
                                 funcTok = funcTok->next();
                                 continue;
                             }
+                            if (Token::simpleMatch(funcTok, "<")) {
+                                funcTok = funcTok->findClosingBracket();
+                                if (funcTok) {
+                                    funcTok = funcTok->next();
+                                } else {
+                                    break;
+                                }
+                                continue;
+                            }
                             break;
                         }
+                        if (!funcTok)
+                            break;
                         if (!Token::Match(funcTok, "%name% (")) {
                             tok = funcTok;
                             continue;

test/cli/other_test.py

@@ -3479,6 +3479,12 @@ class S {
     }
 };
 
+template<typename T>
+std::vector<T> f_t_13() {
+    (void)(*((int*)0));
+    return {};
+}
+
 void f() {}
 """)