diff options
| author | Jason Merrill <jason@redhat.com> | 2011-06-20 10:40:29 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-06-20 10:40:29 -0400 |
| commit | de721390198dfc1d1521b315ad96e556d950224a (patch) | |
| tree | 9cf3845a2f9654498cfcaa0aa475f75b9b85cb97 /gcc | |
| parent | 053225431604d09cbe1d1495581b71a85a72dd1f (diff) | |
| download | gcc-de721390198dfc1d1521b315ad96e556d950224a.zip gcc-de721390198dfc1d1521b315ad96e556d950224a.tar.gz gcc-de721390198dfc1d1521b315ad96e556d950224a.tar.bz2 | |
re PR c++/47635 ([C++0x] ICE on invalid code in constructor_name_p, at cp/name-lookup.c:1809)
PR c++/47635
* decl.c (grokdeclarator): Don't set ctype to an ENUMERAL_TYPE.
From-SVN: r175216
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 22 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/enum20.C | 5 |
4 files changed, 21 insertions, 12 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d88dc60..9269a75 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-06-20 Jason Merrill <jason@redhat.com> + PR c++/47635 + * decl.c (grokdeclarator): Don't set ctype to an ENUMERAL_TYPE. + PR c++/48138 * tree.c (strip_typedefs): Use build_aligned_type. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 85249f1..263ab3f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8338,10 +8338,15 @@ grokdeclarator (const cp_declarator *declarator, else if (TYPE_P (qualifying_scope)) { ctype = qualifying_scope; - if (innermost_code != cdk_function - && current_class_type - && !UNIQUELY_DERIVED_FROM_P (ctype, - current_class_type)) + if (!MAYBE_CLASS_TYPE_P (ctype)) + { + error ("%q#T is not a class or a namespace", ctype); + ctype = NULL_TREE; + } + else if (innermost_code != cdk_function + && current_class_type + && !UNIQUELY_DERIVED_FROM_P (ctype, + current_class_type)) { error ("type %qT is not derived from type %qT", ctype, current_class_type); @@ -9350,7 +9355,7 @@ grokdeclarator (const cp_declarator *declarator, would not have exited the loop above. */ if (declarator && declarator->u.id.qualifying_scope - && TYPE_P (declarator->u.id.qualifying_scope)) + && MAYBE_CLASS_TYPE_P (declarator->u.id.qualifying_scope)) { tree t; @@ -10156,13 +10161,6 @@ grokdeclarator (const cp_declarator *declarator, "declared out of global scope", name); } - if (ctype != NULL_TREE - && TREE_CODE (ctype) != NAMESPACE_DECL && !MAYBE_CLASS_TYPE_P (ctype)) - { - error ("%q#T is not a class or a namespace", ctype); - ctype = NULL_TREE; - } - if (ctype == NULL_TREE) { if (virtualp) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 99d4d3d..337e5f9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2011-06-20 Jason Merrill <jason@redhat.com> + PR c++/47635 + * g++.dg/cpp0x/enum20.C: New. + PR c++/48138 * g++.dg/ext/attr-aligned01.C: New. diff --git a/gcc/testsuite/g++.dg/cpp0x/enum20.C b/gcc/testsuite/g++.dg/cpp0x/enum20.C new file mode 100644 index 0000000..e5dc186 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/enum20.C @@ -0,0 +1,5 @@ +// PR c++/47635 +// { dg-options -std=c++0x } + +enum A { }; +void A::f() { } // { dg-error "not a class" } |