From 4b0040a6a506a01a3f001f9d3be08bb75036eec5 Mon Sep 17 00:00:00 2001 From: Adam Butcher Date: Sat, 29 Mar 2014 19:23:44 +0000 Subject: [PATCH] re PR c++/60626 ([c++1y] ICE with pointer to function with auto parameter) Fix PR c++/60626 PR c++/60626 * parser.c (cp_parser_init_declarator): Handle erroneous generic type usage in non-functions with pushed scope. PR c++/60626 * g++.dg/cpp1y/pr60626.C: New testcase. From-SVN: r208940 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 9 ++++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp1y/pr60626.C | 7 +++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/pr60626.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 49f0d4af2c5..aca5f44c431 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-03-29 Adam Butcher + + PR c++/60626 + * parser.c (cp_parser_init_declarator): Handle erroneous generic type + usage in non-functions with pushed scope. + 2014-03-28 Adam Butcher PR c++/60573 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 5d8446d8640..7bea3d20029 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -16829,7 +16829,14 @@ cp_parser_init_declarator (cp_parser* parser, been issued. */ if (parser->fully_implicit_function_template_p) if (!function_declarator_p (declarator)) - finish_fully_implicit_template (parser, /*member_decl_opt=*/0); + { + if (pushed_scope) + { + pop_scope (pushed_scope); + pushed_scope = 0; + } + finish_fully_implicit_template (parser, /*member_decl_opt=*/0); + } /* For an in-class declaration, use `grokfield' to create the declaration. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e2031db8d33..49000c3508b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-03-29 Adam Butcher + + PR c++/60626 + * g++.dg/cpp1y/pr60626.C: New testcase. + 2014-03-29 Joseph Myers * gcc.dg/pr45416.c: Allow bextr on x86. diff --git a/gcc/testsuite/g++.dg/cpp1y/pr60626.C b/gcc/testsuite/g++.dg/cpp1y/pr60626.C new file mode 100644 index 00000000000..39ea438159a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr60626.C @@ -0,0 +1,7 @@ +// PR c++/60626 +// { dg-do compile { target c++1y } } +// { dg-options "" } + +struct A {}; + +void (*A::p)(auto) = 0; // { dg-error "static member|non-template" }