utils2.c (gnat_build_constructor): Test the TREE_STATIC flag of elements to compute...

	* gcc-interface/utils2.c (gnat_build_constructor): Test the TREE_STATIC
	flag of elements to compute that of the constructor.

From-SVN: r182203

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6a2dd2604fa7a93e5a62a25ec1654d4effdd2e46..6adbc2ab48bd52a34c4e9e7a8919ac4e77d083bc 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/utils2.c (gnat_build_constructor): Test the TREE_STATIC
+       flag of elements to compute that of the constructor.
+
 2011-12-11  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/decl.c (gnat_to_gnu_param): Set the restrict qualifier

diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c
index f9e48b79fe5d9d7079898901b1d38ef7dd8cd4b1..93663b48982757267380b418c3eaba5c7271d27c 100644 (file)
--- a/gcc/ada/gcc-interface/utils2.c
+++ b/gcc/ada/gcc-interface/utils2.c
@@ -1817,7 +1817,7 @@ gnat_build_constructor (tree type, VEC(constructor_elt,gc) *v)
   FOR_EACH_CONSTRUCTOR_ELT (v, n_elmts, obj, val)
     {
       /* The predicate must be in keeping with output_constructor.  */
-      if (!TREE_CONSTANT (val)
+      if ((!TREE_CONSTANT (val) && !TREE_STATIC (val))
          || (TREE_CODE (type) == RECORD_TYPE
              && CONSTRUCTOR_BITFIELD_P (obj)
              && !initializer_constant_valid_for_bitfield_p (val))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 41e3b40a6dbf4f80b0415a20e9352415f483b46b..cfb9a614f1905a9a5bc8f197000f2113cc718976 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gnat.dg/specs/elab3.ads: New test.
+
 2011-12-10  Richard Henderson  <rth@redhat.com>
 
        * gcc.target/powerpc/altivec-perm-1.c: New.

diff --git a/gcc/testsuite/gnat.dg/specs/elab3.ads b/gcc/testsuite/gnat.dg/specs/elab3.ads
new file mode 100644 (file)
index 0000000..7af6f38
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/specs/elab3.ads
@@ -0,0 +1,16 @@
+-- { dg-do compile }
+
+pragma Restrictions(No_Elaboration_Code);
+
+package Elab3 is
+
+   type T_List is array (Positive range <>) of Integer;
+   type T_List_Access is access constant T_List;
+
+   type R is record
+     A : T_List_Access;
+   end record;
+
+   C : constant R := (A => null);
+
+end Elab3;