decl.c (gnat_to_gnu_entity): If the record has a parent field and a representation...

	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Record_Type>: If the
	record has a parent field and a representation clause, make sure that
	it is properly aligned.

From-SVN: r223915

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 2c2b237608ec21322cfc19bffdb9a2e23508cc1a..e105d51edbadaaa7a6080bb090f3ff201fc595ad 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-01  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/decl.c (gnat_to_gnu_entity) <E_Record_Type>: If the
+       record has a parent field and a representation clause, make sure that
+       it is properly aligned.
+
 2015-06-01  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/trans.c (lvalue_required_p) <N_Indexed_Component>: Deal

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 966bf8e1309e3cabcc73f2e36ad79fe102e78b99..21f5f701b979791ae404a6d76758ce330b88949e 100644 (file)
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -3019,6 +3019,12 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
            else
              gnu_parent = gnat_to_gnu_type (gnat_parent);
 
+           /* The parent field needs strict alignment so, if it is to
+              be created with a component clause below, then we need
+              to apply the same adjustment as in gnat_to_gnu_field.  */
+           if (has_rep && TYPE_ALIGN (gnu_type) < TYPE_ALIGN (gnu_parent))
+             TYPE_ALIGN (gnu_type) = TYPE_ALIGN (gnu_parent);
+
            /* Finally we fix up both kinds of twisted COMPONENT_REF we have
               initially built.  The discriminants must reference the fields
               of the parent subtype and not those of its base type for the