OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/60626 ([c++1y] ICE with pointer to function with auto parameter)

Browse Source 
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
This commit is contained in:
Adam Butcher 2014-03-29 19:23:44 +00:00 committed by Adam Butcher
parent cfdc23868b
commit 4b0040a6a5
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2014-03-29 Adam Butcher <adam@jessamine.co.uk>
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 <adam@jessamine.co.uk>
PR c++/60573

9
gcc/cp/parser.c
View File

@ -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. */

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2014-03-29 Adam Butcher <adam@jessamine.co.uk>
PR c++/60626
* g++.dg/cpp1y/pr60626.C: New testcase.
2014-03-29 Joseph Myers <joseph@codesourcery.com>
* gcc.dg/pr45416.c: Allow bextr on x86.

7
gcc/testsuite/g++.dg/cpp1y/pr60626.C Normal file
View File

@ -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" }