attribs: fix typedefs in generic code [PR105492]

In my patch for PR100545 I added an assert to check for broken typedefs in
set_underlying_type, and it found one in this case:
rs6000_handle_altivec_attribute had the same problem as
handle_mode_attribute.  So let's move the fixup into decl_attributes.

	PR c/105492

gcc/ChangeLog:

	* attribs.cc (decl_attributes): Fix broken typedefs here.

gcc/c-family/ChangeLog:

	* c-attribs.cc (handle_mode_attribute): Don't fix broken typedefs
	here.

diff --git a/gcc/attribs.cc b/gcc/attribs.cc
index 6d4a30d..fb89616 100644 (file)
--- a/gcc/attribs.cc
+++ b/gcc/attribs.cc
@@ -872,6 +872,21 @@ decl_attributes (tree *node, tree attributes, int flags,
          tree ret = (spec->handler) (cur_and_last_decl, name, args,
                                      flags|cxx11_flag, &no_add_attrs);
 
+         /* Fix up typedefs clobbered by attribute handlers.  */
+         if (TREE_CODE (*node) == TYPE_DECL
+             && anode == &TREE_TYPE (*node)
+             && DECL_ORIGINAL_TYPE (*node)
+             && TYPE_NAME (*anode) == *node
+             && TYPE_NAME (cur_and_last_decl[0]) != *node)
+           {
+             tree t = cur_and_last_decl[0];
+             DECL_ORIGINAL_TYPE (*node) = t;
+             tree tt = build_variant_type_copy (t);
+             cur_and_last_decl[0] = tt;
+             TREE_TYPE (*node) = tt;
+             TYPE_NAME (tt) = *node;
+           }
+
          *anode = cur_and_last_decl[0];
          if (ret == error_mark_node)
            {

diff --git a/gcc/c-family/c-attribs.cc b/gcc/c-family/c-attribs.cc
index e50e79e..4dc68db 100644 (file)
--- a/gcc/c-family/c-attribs.cc
+++ b/gcc/c-family/c-attribs.cc
@@ -2215,16 +2215,6 @@ handle_mode_attribute (tree *node, tree name, tree args,
                                                 TYPE_QUALS (type));
       if (TYPE_USER_ALIGN (type))
        *node = build_aligned_type (*node, TYPE_ALIGN (type));
-
-      tree decl = node[2];
-      if (decl && TYPE_NAME (type) == decl)
-       {
-         /* Set up the typedef all over again.  */
-         DECL_ORIGINAL_TYPE (decl) = NULL_TREE;
-         TREE_TYPE (decl) = *node;
-         set_underlying_type (decl);
-         *node = TREE_TYPE (decl);
-       }
     }
 
   return NULL_TREE;