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

re PR c++/67257 (Internal compiler error in retrieve_specialization)

Browse Source 
PR c++/67257
	* parser.c (cp_parser_single_declaration): Reject a class template
	that also declares a variable.

From-SVN: r231913
This commit is contained in:
Jason Merrill 2015-12-22 16:46:44 -05:00 committed by Jason Merrill
parent d2889b1427
commit dfc9c48136
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2015-12-22 Jason Merrill <jason@redhat.com>
PR c++/67257
* parser.c (cp_parser_single_declaration): Reject a class template
that also declares a variable.
PR c++/67339
* parser.c (cp_parser_elaborated_type_specifier): Use CLASS_TYPE_P
rather than check for RECORD_TYPE.

16
gcc/cp/parser.c
View File

@ -25642,7 +25642,8 @@ cp_parser_single_declaration (cp_parser* parser,
/* Check for the declaration of a template class. */
if (declares_class_or_enum)
{
if (cp_parser_declares_only_class_p (parser))
if (cp_parser_declares_only_class_p (parser)
|| (declares_class_or_enum & 2))
{
// If this is a declaration, but not a definition, associate
// any constraints with the type declaration. Constraints
@ -25673,6 +25674,19 @@ cp_parser_single_declaration (cp_parser* parser,
/* Perform access checks for template parameters. */
cp_parser_perform_template_parameter_access_checks (checks);
/* Give a helpful diagnostic for
template <class T> struct A { } a;
if we aren't already recovering from an error. */
if (!cp_parser_declares_only_class_p (parser)
&& !seen_error ())
{
error_at (cp_lexer_peek_token (parser->lexer)->location,
"a class template declaration must not declare "
"anything else");
cp_parser_skip_to_end_of_block_or_statement (parser);
goto out;
}
}
}

5
gcc/testsuite/g++.dg/cpp0x/pr51226.C
View File

@ -6,4 +6,7 @@ template<int> struct A // { dg-message "provided" }
enum E : int;
};
template<> enum A<>::E : int {} // { dg-error "wrong number|expected" }
template<> enum A<>::E : int {} // { dg-error "wrong number" }
// { dg-prune-output "expected" }
// { dg-prune-output "specialization" }

11
gcc/testsuite/g++.dg/cpp1y/auto-fn28.C Normal file
View File

@ -0,0 +1,11 @@
// PR c++/67257
// { dg-do compile { target c++14 } }
template <typename> struct plus;
template <typename> struct A {
template <typename T> auto operator()(T);
} foldl; // { dg-error "" }
void foo() { foldl<plus<int>>(0); }
// { dg-prune-output "not declared" }
// { dg-prune-output "expected" }