revert reversion

From-SVN: r53112

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dd1c8f15d7bc116277ac9b7a5d87b80e5de5e9a3..549b49f0d21f2bdaf7c3902c6c3eb8e2ed5367bb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -22,9 +22,6 @@
        * config/i960/i960.h (BOOL_TYPE_SIZE): Don't define.
        * config/mcore/mcore.h (BOOL_TYPE_SIZE): Don't define.
 
-       * dwarf2out.c (gen_type_die): Don't recurse if TYPE_NAME doesn't
-       actually declare this type.
-
 2002-05-02  Loren J. Rittle  <ljrittle@acm.org>
 
        * doc/install.texi (*-*-freebsd*): Update to latest status.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2844ad38d6dbba13dd2deb9c65774d1d2617e3a3..b2b71e9743762852b2a40c70bd2f0ab2180a3b79 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -2,8 +2,6 @@
 
        * decl.c (BOOL_TYPE_SIZE): Move default to defaults.h.
 
-       * decl.c (grokdeclarator): Revert last change.
-
 2002-05-02  Mark Mitchell  <mark@codesourcery.com>
 
        * init.c (perform_base_cleanups): Correct order of base class

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 99e69fadd7c738ddd58adceaae64d53e85ab0250..ebff32f9e02f722ff704b0e50965c3913be8c3fb 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -11270,6 +11270,8 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
          && TYPE_NAME (type)
          && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL
          && TYPE_ANONYMOUS_P (type)
+         /* Don't do this if there are attributes.  */
+         && (!attrlist || !*attrlist)
          && cp_type_quals (type) == TYPE_UNQUALIFIED)
        {
          tree oldname = TYPE_NAME (type);

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 8f4126ac8671bffbbe5aea697c6934d7d1952a9f..e99665fa42588ade4e6b4efe960b3442d66ed303 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -11045,7 +11045,6 @@ gen_type_die (type, context_die)
     return;
 
   if (TYPE_NAME (type) && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL
-      && TREE_TYPE (TYPE_NAME (type)) == type
       && DECL_ORIGINAL_TYPE (TYPE_NAME (type)))
     {
       TREE_ASM_WRITTEN (type) = 1;