diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-12-29 09:28:06 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-12-29 09:28:06 +0100 |
| commit | 19bb3aa5c5b80330b86ac07b0590573af43d83cc (patch) | |
| tree | 9b37fb80dd3b6b97223446dfd75d0c044727ade9 | |
| parent | bbddfe5b6c53a0daad579fbc025b8f5d63c24687 (diff) | |
| download | gcc-19bb3aa5c5b80330b86ac07b0590573af43d83cc.zip gcc-19bb3aa5c5b80330b86ac07b0590573af43d83cc.tar.gz gcc-19bb3aa5c5b80330b86ac07b0590573af43d83cc.tar.bz2 | |
re PR c++/38637 (ICE with template declaration of enum)
PR c++/38637
* decl.c (start_enum): If enumtype is error_mark_node, exit early.
* g++.dg/cpp0x/enum2.C: New test.
From-SVN: r142946
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/enum2.C | 5 |
4 files changed, 18 insertions, 0 deletions
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 <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 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 <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 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<int> enum E : int { e }; // { dg-error "template declaration of" } |