diff options
author | Reid Kleckner <reid@kleckner.net> | 2014-12-15 23:16:32 +0000 |
---|---|---|
committer | Reid Kleckner <reid@kleckner.net> | 2014-12-15 23:16:32 +0000 |
commit | d61a3110106abaa9073d255472a1331473612fcd (patch) | |
tree | dd89f41124872f21656f875204bf6790a8c1852b /clang/lib/Parse/Parser.cpp | |
parent | 42102b110eafdd73d70613d6f960452c5f82cea4 (diff) | |
download | bcm5719-llvm-d61a3110106abaa9073d255472a1331473612fcd.tar.gz bcm5719-llvm-d61a3110106abaa9073d255472a1331473612fcd.zip |
Diagnose function template definitions inside functions
The parser can only be tricked into parsing a function template
definition by inserting a typename keyword before the function template
declaration. This used to make us crash, and now it's fixed.
While here, remove an unneeded boolean parameter from ParseDeclGroup.
This boolean always corresponded to non-typedef declarators at file
scope. ParseDeclGroup already has precise diagnostics for the function
definition typedef case, so we can let that through.
Fixes PR21839.
llvm-svn: 224287
Diffstat (limited to 'clang/lib/Parse/Parser.cpp')
-rw-r--r-- | clang/lib/Parse/Parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index 7119e9af760..cf7c0fe32da 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -890,7 +890,7 @@ Parser::ParseDeclOrFunctionDefInternal(ParsedAttributesWithRange &attrs, return Actions.ConvertDeclToDeclGroup(TheDecl); } - return ParseDeclGroup(DS, Declarator::FileContext, true); + return ParseDeclGroup(DS, Declarator::FileContext); } Parser::DeclGroupPtrTy |