summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2008-12-29 08:28:06 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2008-12-29 08:28:06 +0000
commit934e3486a34d6b75a7ee6ad7f1e4955b281cd790 (patch)
tree9b37fb80dd3b6b97223446dfd75d0c044727ade9
parent4d08644ea7c637356dd47d7b92e5f696481ae657 (diff)
downloadppe42-gcc-934e3486a34d6b75a7ee6ad7f1e4955b281cd790.tar.gz
ppe42-gcc-934e3486a34d6b75a7ee6ad7f1e4955b281cd790.zip
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
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/enum2.C5
4 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index df04c1bb85a..8611d928dc8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-29 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/38637
+ * decl.c (start_enum): If enumtype is error_mark_node, exit early.
+
2008-12-28 Jakub Jelinek <jakub@redhat.com>
PR c++/38650
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index efc7e2eb8a3..76482d2e371 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 42cc3da1a8b..33f1b47d317 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-29 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/38637
+ * g++.dg/cpp0x/enum2.C: New test.
+
2008-12-28 Andrew Pinski <pinskia@gmail.com>
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 00000000000..2353f1d47e6
--- /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<int> enum E : int { e }; // { dg-error "template declaration of" }
OpenPOWER on IntegriCloud