From: Eric Botcazou Date: Wed, 12 Mar 2003 09:54:38 +0000 (+0100) Subject: re PR c/9928 (ICE on duplicate enum declaration) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a7d6cb3d82be44da036f45e244d01cd4f9ab0e5;p=gcc.git re PR c/9928 (ICE on duplicate enum declaration) PR c/9928 * c-decl.c (duplicate_decls): Discard the initializer of the new decl only if it is a VAR_DECL. From-SVN: r64235 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f0f4738ad33..7dc4ec5a490 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-03-12 Eric Botcazou + + PR c/9928 + * c-decl.c (duplicate_decls): Discard the initializer of the new decl + only if it is a VAR_DECL. + 2003-03-12 Eric Botcazou PR optimization/9888 diff --git a/gcc/c-decl.c b/gcc/c-decl.c index f7996f1a812..2aa0ee77f67 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -1146,7 +1146,8 @@ duplicate_decls (newdecl, olddecl, different_binding_level) to variables that were declared between olddecl and newdecl. This will make the initializer invalid for olddecl in case it gets assigned to olddecl below. */ - DECL_INITIAL (newdecl) = 0; + if (TREE_CODE (newdecl) == VAR_DECL) + DECL_INITIAL (newdecl) = 0; } /* TLS cannot follow non-TLS declaration. */ else if (TREE_CODE (olddecl) == VAR_DECL && TREE_CODE (newdecl) == VAR_DECL diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3e0633c3ef1..73405565b9c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2003-03-12 Eric Botcazou + + * gcc.dg/decl-3.c: New test. + 2003-03-12 Eric Botcazou * gcc.dg/i386-loop-2.c: New test. diff --git a/gcc/testsuite/gcc.dg/decl-3.c b/gcc/testsuite/gcc.dg/decl-3.c new file mode 100644 index 00000000000..b8d00d0203d --- /dev/null +++ b/gcc/testsuite/gcc.dg/decl-3.c @@ -0,0 +1,5 @@ +/* PR c/9928 */ +/* { dg-do compile } */ + +enum { CODES }; /* { dg-error "previous declaration" } */ +enum { CODES }; /* { dg-error "conflicting types" } */