dwarf2out.c (gen_type_die): Don't recurse if TYPE_NAME doesn't actually declare this...

        * dwarf2out.c (gen_type_die): Don't recurse if TYPE_NAME doesn't
        actually declare this type.
        * decl.c (grokdeclarator): Revert last change.

From-SVN: r53084

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3556314e8a5f36b4125ce2f9a430a60f18d52d98..6ba526678081a24973aba767e9b5aab49ed20981 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-02  Jason Merrill  <jason@redhat.com>
+
+       * 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 560ff132fa8ecc3c70e90c6ea17242a11a9b66c2..02c5307a65093bd3606acfa37191991ebb6eec42 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-03  Jason Merrill  <jason@redhat.com>
+
+       * 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 593963d7e8ea51a6c54f6440b1776717465a3f84..35a9315ad182731af42104c2fdefa087235f2d09 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -11275,8 +11275,6 @@ 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 e99665fa42588ade4e6b4efe960b3442d66ed303..8f4126ac8671bffbbe5aea697c6934d7d1952a9f 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -11045,6 +11045,7 @@ 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;