From bc699cc72ffa972cb158f80e49da980996b66e88 Mon Sep 17 00:00:00 2001 From: abutcher Date: Tue, 25 Feb 2014 06:44:53 +0000 Subject: [PATCH] Fix PR c++/60311. PR c++/60311 * parser.c (function_being_declared_is_template_p): Return false when processing a template parameter list. (cp_parser_parameter_declaration_clause): Don't set auto_is_implicit_function_template_parm_p when processing a template parameter list. PR c++/60311 * g++.dg/cpp1y/pr60311.C: New testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208111 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/parser.c | 4 ++-- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/cpp1y/pr60311.C | 15 +++++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/pr60311.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fa6b3cf..5afc6d8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,12 @@ 2014-02-25 Adam Butcher + PR c++/60311 + * parser.c (function_being_declared_is_template_p): Return false when + processing a template parameter list. + (cp_parser_parameter_declaration_clause): Don't set + auto_is_implicit_function_template_parm_p when processing a + template parameter list. + * parser.c (synthesize_implicit_template_parm): Inject new template argument list appropriately when a generic member function of a class template is declared out-of-line. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 2d7918c..ef36327 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -18122,7 +18122,7 @@ cp_parser_type_specifier_seq (cp_parser* parser, static bool function_being_declared_is_template_p (cp_parser* parser) { - if (!current_template_parms) + if (!current_template_parms || processing_template_parmlist) return false; if (parser->implicit_template_scope) @@ -18165,7 +18165,7 @@ cp_parser_parameter_declaration_clause (cp_parser* parser) (void) cleanup; - if (!processing_specialization) + if (!processing_specialization && !processing_template_parmlist) if (!current_function_decl || (current_class_type && LAMBDA_TYPE_P (current_class_type))) parser->auto_is_implicit_function_template_parm_p = true; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d59f4ec..d8d760a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2014-02-25 Adam Butcher + PR c++/60311 + * g++.dg/cpp1y/pr60311.C: New testcase. + * g++.dg/cpp1y/fn-generic-member-ool.C: New testcase. PR c++/60065 diff --git a/gcc/testsuite/g++.dg/cpp1y/pr60311.C b/gcc/testsuite/g++.dg/cpp1y/pr60311.C new file mode 100644 index 0000000..a0db22d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr60311.C @@ -0,0 +1,15 @@ +// PR c++/60311 +// { dg-options -std=c++1y } + +template struct A {}; // { dg-error "auto" } + +struct B { + template struct A {}; // { dg-error "auto" } +}; + +template +struct C { + template struct A {}; // { dg-error "auto" } +}; + +using D = C; -- 2.7.4