procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/18758 (ICE redeclaring struct as template)

Browse source 
cp:
	PR c++/18758
	* parser.c (cp_parser_class_head): Return NULL_TREE when
	push_template_decl fails.  Update comment.
testsuite:
	PR 18758
	* g++.dg/parse/crash21.C: New.

From-SVN: r91636
This commit is contained in:
Nathan Sidwell 2004-12-02 13:35:15 +00:00 • committed by Nathan Sidwell
parent 9b8d9ac39f
commit 55dcbc1297
4 changed files with 29 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 @@
2004-12-02 Nathan Sidwell <nathan@codesourcery.com>
PR c++/18758
* parser.c (cp_parser_class_head): Return NULL_TREE when
push_template_decl fails. Update comment.
2004-12-02 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/15664, c++/18276

12
gcc/cp/parser.c
View file

@ -12443,6 +12443,8 @@ cp_parser_class_specifier (cp_parser* parser)
*NESTED_NAME_SPECIFIER_P to TRUE iff one of the productions
involving a nested-name-specifier was used, and FALSE otherwise.
Returns error_mark_node if this is not a class-head.
Returns NULL_TREE if the class-head is syntactically valid, but
semantically invalid in a way that means we should skip the entire
body of the class. */
@ -12714,7 +12716,15 @@ cp_parser_class_head (cp_parser* parser,
type = TYPE_MAIN_DECL (TREE_TYPE (type));
if (PROCESSING_REAL_TEMPLATE_DECL_P ()
&& !CLASSTYPE_TEMPLATE_SPECIALIZATION (TREE_TYPE (type)))
type = push_template_decl (type);
{
type = push_template_decl (type);
if (type == error_mark_node)
{
type = NULL_TREE;
goto done;
}
}
type = TREE_TYPE (type);
if (nested_name_specifier)
{

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2004-12-02 Nathan Sidwell <nathan@codesourcery.com>
PR 18758
* g++.dg/parse/crash21.C: New.
2004-12-02 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/15664, c++/18276

7
gcc/testsuite/g++.dg/parse/crash21.C Normal file
View file

@ -0,0 +1,7 @@
namespace N
{
struct A; // { dg-error "previous declaration" "" }
}
template<int I>
struct N::A {}; // { dg-error "redeclared" "" }