From de721390198dfc1d1521b315ad96e556d950224a Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 20 Jun 2011 10:40:29 -0400
Subject: [PATCH] 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
---
 gcc/cp/ChangeLog                    |  3 +++
 gcc/cp/decl.c                       | 22 ++++++++++------------
 gcc/testsuite/ChangeLog             |  3 +++
 gcc/testsuite/g++.dg/cpp0x/enum20.C |  5 +++++
 4 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/enum20.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d88dc6089da..9269a759d34 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 85249f11480..263ab3fdafe 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 99d4d3d410a..337e5f9a2f4 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 00000000000..e5dc186e4af
--- /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" }
-- 
2.30.2