From 048e14fc025471eff2817942c51171349bed580d Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Sun, 18 May 2014 17:51:15 +0000 Subject: [PATCH] * gcc-interface/decl.c (gnat_to_gnu_entity) : Do not consider that regular packed arrays can never be superflat. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210583 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/decl.c | 6 ++++-- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gnat.dg/enum3.adb | 23 +++++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/enum3.adb diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0102460767c..c1e01de4b8d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2014-05-18 Eric Botcazou + + * gcc-interface/decl.c (gnat_to_gnu_entity) : Do not + consider that regular packed arrays can never be superflat. + 2014-05-17 Trevor Saunders * gcc-interface/ada-tree.h: Remove usage of variable_size gty diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index ff1210e6c87..59ec0571b66 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -2420,8 +2420,10 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) we can just use the high bound of the index type. */ else if ((Nkind (gnat_index) == N_Range && cannot_be_superflat_p (gnat_index)) - /* Packed Array Types are never superflat. */ - || Is_Packed_Array_Type (gnat_entity)) + /* Bit-Packed Array Types are never superflat. */ + || (Is_Packed_Array_Type (gnat_entity) + && Is_Bit_Packed_Array + (Original_Array_Type (gnat_entity)))) gnu_high = gnu_max; /* Otherwise, if the high bound is constant but the low bound is diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fbb18caaf7b..a186323cd4a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2014-05-18 Eric Botcazou + + * gnat.dg/enum3.adb: New test. + 2014-05-18 Andreas Schwab * gcc.target/ia64/visibility-1.c (variable_l): Add used attribute. diff --git a/gcc/testsuite/gnat.dg/enum3.adb b/gcc/testsuite/gnat.dg/enum3.adb new file mode 100644 index 00000000000..1cb6c4b5648 --- /dev/null +++ b/gcc/testsuite/gnat.dg/enum3.adb @@ -0,0 +1,23 @@ +-- { dg-do run } + +procedure Enum3 is + type Enum is (Aaa, Bbb, Ccc); + for Enum use (1,2,4); +begin + for Lo in Enum loop + for Hi in Enum loop + declare + subtype S is Enum range Lo .. Hi; + type Vector is array (S) of Integer; + Vec : Vector; + begin + for I in S loop + Vec (I) := 0; + end loop; + if Vec /= (S => 0) then + raise Program_Error; + end if; + end; + end loop; + end loop; +end; -- 2.11.4.GIT