tree-nested.c (get_descriptor_type): Make sure that the alignment of descriptors...

	* tree-nested.c (get_descriptor_type): Make sure that the alignment of
	descriptors is at least equal to that of functions.

From-SVN: r246646

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e9f14aa00491b63c1bb13ce3ddb7c193a40d5a15..89b3d0d7def51dc0cdaa9821c98a26287534010e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * tree-nested.c (get_descriptor_type): Make sure that the alignment of
+       descriptors is at least equal to that of functions.
+
 2017-04-02  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/sse.md (movdi_to_sse): Add missing DONE.

diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index 4a25025ef8f13bc5e52035062fa7e6dbdb7a9695..48022cd4c11278029eab5bef77684f1cec48ccde 100644 (file)
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -496,6 +496,8 @@ static GTY(()) tree descriptor_type;
 static tree
 get_descriptor_type (struct nesting_info *info)
 {
+  /* The base alignment is that of a function.  */
+  const unsigned align = FUNCTION_ALIGNMENT (FUNCTION_BOUNDARY);
   tree t;
 
   if (descriptor_type)
@@ -505,6 +507,8 @@ get_descriptor_type (struct nesting_info *info)
   t = build_array_type (ptr_type_node, t);
   t = build_decl (DECL_SOURCE_LOCATION (info->context),
                  FIELD_DECL, get_identifier ("__data"), t);
+  SET_DECL_ALIGN (t, MAX (TYPE_ALIGN (ptr_type_node), align));
+  DECL_USER_ALIGN (t) = 1;
 
   descriptor_type = make_node (RECORD_TYPE);
   TYPE_NAME (descriptor_type) = get_identifier ("__builtin_descriptor");