[Ada] Accept size for record with oversized component clause

Message ID 8729710.nNBm8ti0Py@polaris
State New
Headers show
Series
  • [Ada] Accept size for record with oversized component clause
Related show

Commit Message

Eric Botcazou Oct. 11, 2019, 9:08 a.m.
This makes the compiler accept again an exact size clause for a record type 
that contains both a component subject to a representation clause that gives 
it a size greater than its nominal size and another component that is aliased.

Tested on x86_64-suse-linux, applied on the mainline.


2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>

	* gcc-interface/decl.c (gnat_to_gnu_field): Adjust again the packing
	for a field without strict alignment and with an oversized clause.


2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>

	* gnat.dg/specs/size_clause4.ads: New test.

-- 
Eric Botcazou

Patch

Index: gcc-interface/decl.c
===================================================================
--- gcc-interface/decl.c	(revision 276866)
+++ gcc-interface/decl.c	(working copy)
@@ -7229,10 +7229,17 @@  gnat_to_gnu_field (Entity_Id gnat_field,
 	  && INTEGRAL_TYPE_P (TREE_TYPE (TYPE_FIELDS (gnu_field_type))))
 	gnu_field_type = TREE_TYPE (TYPE_FIELDS (gnu_field_type));
 
+      orig_field_type = gnu_field_type;
       gnu_field_type
 	= make_type_from_size (gnu_field_type, gnu_size,
 			       Has_Biased_Representation (gnat_field));
 
+      /* If the type has been extended, we may need to cap the alignment.  */
+      if (!needs_strict_alignment
+	  && gnu_field_type != orig_field_type
+	  && tree_int_cst_lt (TYPE_SIZE (orig_field_type), gnu_size))
+	packed = adjust_packed (gnu_field_type, gnu_record_type, packed);
+
       orig_field_type = gnu_field_type;
       gnu_field_type = maybe_pad_type (gnu_field_type, gnu_size, 0, gnat_field,
 				       false, false, definition, true);