From 09c9ed5bb8b8e3b65dd2f631bf18f6b796499fbd Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Wed, 3 Jul 2019 08:14:15 +0000 Subject: [PATCH] [Ada] Fix bogus error on array with overaligned scalar component The compiler would wrongly reject an alignment clause larger than 8 on the component type of an array of scalars, which is valid albeit pathological. 2019-07-03 Eric Botcazou gcc/ada/ * layout.adb (Layout_Type): Do not set the component size of an array with a scalar component if the component type is overaligned. gcc/testsuite/ * gnat.dg/alignment14.adb: New testcase. From-SVN: r272968 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/layout.adb | 10 ++++++++-- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gnat.dg/alignment14.adb | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/alignment14.adb diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 443947c9c0c..e932dab6568 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2019-07-03 Eric Botcazou + + * layout.adb (Layout_Type): Do not set the component size of an + array with a scalar component if the component type is + overaligned. + 2019-07-03 Ed Schonberg * inline.adb (Make_Loop_Labels_Unique): New procedure to modify diff --git a/gcc/ada/layout.adb b/gcc/ada/layout.adb index f5f6aa83871..56379465d0e 100644 --- a/gcc/ada/layout.adb +++ b/gcc/ada/layout.adb @@ -443,9 +443,12 @@ package body Layout is Set_RM_Size (E, Esize (E)); end if; - -- For array base types, set component size if object size of the + -- For array base types, set the component size if object size of the -- component type is known and is a small power of 2 (8, 16, 32, 64), - -- since this is what will always be used. + -- since this is what will always be used, except if a very large + -- alignment was specified and so Adjust_Esize_For_Alignment gave up + -- because, in this case, the object size is not a multiple of the + -- alignment and, therefore, cannot be the component size. if Ekind (E) = E_Array_Type and then Unknown_Component_Size (E) then declare @@ -458,6 +461,9 @@ package body Layout is if Present (CT) and then Is_Scalar_Type (CT) and then Known_Static_Esize (CT) + and then not (Known_Alignment (CT) + and then Alignment_In_Bits (CT) > + Standard_Long_Long_Integer_Size) then declare S : constant Uint := Esize (CT); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 925e8b7e699..245bf25d4ac 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-07-03 Eric Botcazou + + * gnat.dg/alignment14.adb: New testcase. + 2019-07-03 Ed Schonberg * gnat.dg/predicate4.adb, gnat.dg/predicate4_pkg.ads: New diff --git a/gcc/testsuite/gnat.dg/alignment14.adb b/gcc/testsuite/gnat.dg/alignment14.adb new file mode 100644 index 00000000000..48ef6bd14e6 --- /dev/null +++ b/gcc/testsuite/gnat.dg/alignment14.adb @@ -0,0 +1,17 @@ +-- { dg-do compile } + +procedure Alignment14 is + + type My_Int1 is new Integer; + for My_Int1'Alignment use 8; + + type Arr1 is array (1 .. 2) of My_Int1; + + type My_Int2 is new Integer; + for My_Int2'Alignment use 16; + + type Arr2 is array (1 .. 2) of My_Int2; + +begin + null; +end Alignment14; -- 2.30.2