* stor-layout.c (layout_decl): Do not bump the alignment of a

[pf3gnuchains/gcc-fork.git] / gcc / stor-layout.c

diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 2260917..a7bcd05 100644 (file)
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -388,13 +388,13 @@ layout_decl (tree decl, unsigned int known_align)
            {
              enum machine_mode xmode
                = mode_for_size_tree (DECL_SIZE (decl), MODE_INT, 1);
+             unsigned int xalign = GET_MODE_ALIGNMENT (xmode);
 
              if (xmode != BLKmode
-                 && (known_align == 0
-                     || known_align >= GET_MODE_ALIGNMENT (xmode)))
+                 && !(xalign > BITS_PER_UNIT && DECL_PACKED (decl))
+                 && (known_align == 0 || known_align >= xalign))
                {
-                 DECL_ALIGN (decl) = MAX (GET_MODE_ALIGNMENT (xmode),
-                                          DECL_ALIGN (decl));
+                 DECL_ALIGN (decl) = MAX (xalign, DECL_ALIGN (decl));
                  DECL_MODE (decl) = xmode;
                  DECL_BIT_FIELD (decl) = 0;
                }
@@ -496,17 +496,6 @@ relayout_decl (tree decl)
   layout_decl (decl, 0);
 }
 \f
-/* Hook for a front-end function that can modify the record layout as needed
-   immediately before it is finalized.  */
-
-static void (*lang_adjust_rli) (record_layout_info) = 0;
-
-void
-set_lang_adjust_rli (void (*f) (record_layout_info))
-{
-  lang_adjust_rli = f;
-}
-
 /* Begin laying out type T, which may be a RECORD_TYPE, UNION_TYPE, or
    QUAL_UNION_TYPE.  Return a pointer to a struct record_layout_info which
    is to be passed to all other layout functions for this record.  It is the
@@ -1866,9 +1855,6 @@ layout_type (tree type)
        if (TREE_CODE (type) == QUAL_UNION_TYPE)
          TYPE_FIELDS (type) = nreverse (TYPE_FIELDS (type));
 
-       if (lang_adjust_rli)
-         (*lang_adjust_rli) (rli);
-
        /* Finish laying out the record.  */
        finish_record_layout (rli, /*free_p=*/true);
       }
@@ -1886,13 +1872,10 @@ layout_type (tree type)
       && TREE_CODE (type) != QUAL_UNION_TYPE)
     finalize_type_size (type);
 
-  /* If an alias set has been set for this aggregate when it was incomplete,
-     force it into alias set 0.
-     This is too conservative, but we cannot call record_component_aliases
-     here because some frontends still change the aggregates after
-     layout_type.  */
-  if (AGGREGATE_TYPE_P (type) && TYPE_ALIAS_SET_KNOWN_P (type))
-    TYPE_ALIAS_SET (type) = 0;
+  /* We should never see alias sets on incomplete aggregates.  And we
+     should not call layout_type on not incomplete aggregates.  */
+  if (AGGREGATE_TYPE_P (type))
+    gcc_assert (!TYPE_ALIAS_SET_KNOWN_P (type));
 }
 \f
 /* Create and return a type for signed integers of PRECISION bits.  */