From c0425f32f5e469d41e5e1c899f20839fdeffe0f1 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 17 Dec 2011 14:26:46 -0500 Subject: [PATCH] re PR c++/51587 (ICE with struct vs. enum clash) PR c++/51587 * decl.c (start_enum): Avoid using ENUM_UNDERLYING_TYPE on a non-enum. From-SVN: r182441 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 1 + gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/parse/enum6.C | 8 ++++++++ 4 files changed, 20 insertions(+) create mode 100644 gcc/testsuite/g++.dg/parse/enum6.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6ed8a03ebe9..a63aa163dd4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-12-17 Jason Merrill + + PR c++/51587 + * decl.c (start_enum): Avoid using ENUM_UNDERLYING_TYPE on a + non-enum. + 2011-12-16 Jason Merrill PR c++/51416 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index fedc52cd833..0a43fb80cdc 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -12069,6 +12069,7 @@ start_enum (tree name, tree enumtype, tree underlying_type, /* Do not push the decl more than once, unless we need to compare underlying types at instantiation time */ if (!enumtype + || TREE_CODE (enumtype) != ENUMERAL_TYPE || (underlying_type && dependent_type_p (underlying_type)) || (ENUM_UNDERLYING_TYPE (enumtype) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 660ff9b1a86..71194f56be3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-12-17 Jason Merrill + + PR c++/51587 + * g++.dg/parse/enum6.C: New. + 2011-12-17 Tom de Vries PR tree-optimization/51491 diff --git a/gcc/testsuite/g++.dg/parse/enum6.C b/gcc/testsuite/g++.dg/parse/enum6.C new file mode 100644 index 00000000000..e753f5170f2 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/enum6.C @@ -0,0 +1,8 @@ +// PR c++/51587 + +namespace N +{ + struct X; // { dg-message "previous declaration" } +} + +enum N::X {}; // { dg-error "conflicting declaration" } -- 2.30.2