From: Eric Botcazou <ebotcazou@adacore.com>
Date: Sun, 18 May 2014 17:51:15 +0000 (+0000)
Subject: decl.c (gnat_to_gnu_entity): Do not consider that regular packed arrays can never... 
X-Git-Tag: releases/gcc-5.1.0~7486
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9d7d7c14cc8fe8c62e22c1edc5d4e2db57394fb;p=thirdparty%2Fgcc.git

decl.c (gnat_to_gnu_entity): Do not consider that regular packed arrays can never be superflat.

	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Array_Subtype>: Do not
	consider that regular packed arrays can never be superflat.

From-SVN: r210583
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0102460767c6..c1e01de4b8d4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-18  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Array_Subtype>: Do not
+	consider that regular packed arrays can never be superflat.
+
 2014-05-17  Trevor Saunders  <tsaunders@mozilla.com>
 
 	* 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 ff1210e6c87c..59ec0571b66c 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 fbb18caaf7b2..a186323cd4af 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-18  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/enum3.adb: New test.
+
 2014-05-18  Andreas Schwab  <schwab@suse.de>
 
 	* 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 000000000000..1cb6c4b56486
--- /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;