From 934e3486a34d6b75a7ee6ad7f1e4955b281cd790 Mon Sep 17 00:00:00 2001 From: jakub Date: Mon, 29 Dec 2008 08:28:06 +0000 Subject: [PATCH] PR c++/38637 * decl.c (start_enum): If enumtype is error_mark_node, exit early. * g++.dg/cpp0x/enum2.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142946 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 3 +++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/enum2.C | 5 +++++ 4 files changed, 18 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/enum2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index df04c1b..8611d92 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2008-12-29 Jakub Jelinek + + PR c++/38637 + * decl.c (start_enum): If enumtype is error_mark_node, exit early. + 2008-12-28 Jakub Jelinek PR c++/38650 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index efc7e2e..76482d2 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10891,6 +10891,9 @@ start_enum (tree name, tree underlying_type, bool scoped_enum_p) enumtype = pushtag (name, enumtype, /*tag_scope=*/ts_current); } + if (enumtype == error_mark_node) + return enumtype; + if (scoped_enum_p) { SET_SCOPED_ENUM_P (enumtype, 1); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 42cc3da..33f1b47 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-12-29 Jakub Jelinek + + PR c++/38637 + * g++.dg/cpp0x/enum2.C: New test. + 2008-12-28 Andrew Pinski PR libobjc/36610 diff --git a/gcc/testsuite/g++.dg/cpp0x/enum2.C b/gcc/testsuite/g++.dg/cpp0x/enum2.C new file mode 100644 index 0000000..2353f1d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/enum2.C @@ -0,0 +1,5 @@ +// PR c++/38637 +// { dg-do compile } +// { dg-options "-std=c++0x" } + +template enum E : int { e }; // { dg-error "template declaration of" } -- 2.7.4