From: Mark Mitchell <mark@codesourcery.com>
Date: Thu, 19 Jul 2001 07:22:40 +0000 (+0000)
Subject: * class.c (finish_struct_anon): Forbid nested classes.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b7076960b306190210070be081ea318d7eb17d21;p=gcc.git

* class.c (finish_struct_anon): Forbid nested classes.

From-SVN: r44148
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0fa3fdb4bc8..fb7d6c1ec76 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-19  Mark Mitchell  <mark@codesourcery.com>
+
+	* class.c (finish_struct_anon): Forbid nested classes.
+
 2001-07-19  Neil Booth  <neil@daikokuya.demon.co.uk>
 
 	* decl2.c: Don't include dwarfout.h and dwarf2out.h.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index c3aa297236b..087b7c807ef 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -3132,7 +3132,14 @@ finish_struct_anon (t)
 	  tree elt = TYPE_FIELDS (TREE_TYPE (field));
 	  for (; elt; elt = TREE_CHAIN (elt))
 	    {
-	      if (DECL_ARTIFICIAL (elt))
+	      /* We're generally only interested in entities the user
+		 declared, but we also find nested classes by noticing
+		 the TYPE_DECL that we create implicitly.  You're
+		 allowed to put one anonymous union inside another,
+		 though, so we explicitly tolerate that.  */
+	      if (DECL_ARTIFICIAL (elt) 
+		  && (!DECL_IMPLICIT_TYPEDEF_P (elt)
+		      || ANON_AGGR_TYPE_P (TREE_TYPE (elt))))
 		continue;
 
 	      if (DECL_NAME (elt) == constructor_name (t))
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/anon3.C b/gcc/testsuite/g++.old-deja/g++.jason/anon3.C
index b3f05f8ad14..96353fcc97b 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/anon3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/anon3.C
@@ -8,7 +8,7 @@ public:
 private:
   union {
     float vf;
-    struct ff {
+    struct ff { // ERROR - nested class in anonymous union
       void *ptr;
       char *name;
       int sz;