From: Eric Botcazou <ebotcazou@adacore.com>
Date: Wed, 29 Dec 2021 22:33:21 +0000 (+0100)
Subject: [Ada] Fix error on too large size clause for bit-packed array
X-Git-Tag: basepoints/gcc-13~1922
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68adddccb139f87ff705fd744eb3771fc2c6497a;p=thirdparty%2Fgcc.git

[Ada] Fix error on too large size clause for bit-packed array

gcc/ada/

	* exp_pakd.adb (Install_PAT): Do not reset the alignment here.
	* layout.adb (Layout_Type): Call Adjust_Esize_Alignment after having
	copied the RM_Size onto the Esize when the latter is too small.
---

diff --git a/gcc/ada/exp_pakd.adb b/gcc/ada/exp_pakd.adb
index 779dbb3ad306..78093f8529ba 100644
--- a/gcc/ada/exp_pakd.adb
+++ b/gcc/ada/exp_pakd.adb
@@ -577,7 +577,6 @@ package body Exp_Pakd is
 
          --  Set remaining fields of packed array type
 
-         Reinit_Alignment              (PAT);
          Set_Parent                    (PAT, Empty);
          Set_Associated_Node_For_Itype (PAT, Typ);
          Set_Original_Array_Type       (PAT, Typ);
diff --git a/gcc/ada/layout.adb b/gcc/ada/layout.adb
index 092f2f58cfb4..5a6acf6bb9ca 100644
--- a/gcc/ada/layout.adb
+++ b/gcc/ada/layout.adb
@@ -616,7 +616,7 @@ package body Layout is
                Size : constant Uint := RM_Size (E);
 
             begin
-               Set_Esize (E, RM_Size (E));
+               Set_Esize (E, Size);
 
                --  For scalar types, increase Object_Size to power of 2, but
                --  not less than a storage unit in any case (i.e., normally
@@ -641,6 +641,11 @@ package body Layout is
                   loop
                      Set_Alignment (E, 2 * Alignment (E));
                   end loop;
+
+               --  For the other types, apply standard adjustments
+
+               else
+                  Adjust_Esize_Alignment (E);
                end if;
             end;
          end if;