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

re PR c++/20499 (ICE on duplicate class definition)

Browse Source 
PR c++/20499
	* parser.c (cp_parser_class_head): Return NULL_TREE when
	encountering a redefinition.

	* g++.dg/parse/error16.C: Tweak error markers.

From-SVN: r96870
This commit is contained in:
Volker Reichelt 2005-03-22 14:44:10 +00:00 committed by Volker Reichelt
parent b2a6a2fb64
commit 0f3744f8c2
4 changed files with 15 additions and 3 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 @@
2005-03-22 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
PR c++/20499
* parser.c (cp_parser_class_head): Return NULL_TREE when
encountering a redefinition.
2005-03-22 Nathan Sidwell <nathan@codesourcery.com> 2005-03-22 Nathan Sidwell <nathan@codesourcery.com>
PR c++/20465 PR c++/20465

3
gcc/cp/parser.c
View File

@ -12858,7 +12858,8 @@ cp_parser_class_head (cp_parser* parser,
{ {
error ("redefinition of %q#T", type); error ("redefinition of %q#T", type);
cp_error_at ("previous definition of %q#T", type); cp_error_at ("previous definition of %q#T", type);
type = error_mark_node; type = NULL_TREE;
goto done;
} }
/* We will have entered the scope containing the class; the names of /* We will have entered the scope containing the class; the names of

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2005-03-22 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
PR c++/20499
* g++.dg/parse/error16.C: Tweak error markers.
2005-03-22 Jakub Jelinek <jakub@redhat.com> 2005-03-22 Jakub Jelinek <jakub@redhat.com>
PR target/20561 PR target/20561

4
gcc/testsuite/g++.dg/parse/error16.C
View File

@ -2,7 +2,7 @@
struct A struct A
{ {
struct B {}; // { dg-error "" } struct B {}; // { dg-error "previous" }
}; };
struct A::B{}; // { dg-error "" } struct A::B{}; // { dg-error "redefinition" }