decl.c (gnat_to_gnu_entity): Apply the promotion to static memory earlier in the...

	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Variable>: Apply the
	promotion to static memory earlier in the processing.

From-SVN: r251929

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6015967ab325349a1744e79edef814d108dc7dd4..2c906b9b9e78feff8934a0c91664020249ca6e29 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/decl.c (gnat_to_gnu_entity) <E_Variable>: Apply the
+       promotion to static memory earlier in the processing.
+
 2017-09-09  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/decl.c (gnat_to_gnu_entity): Only set the TYPE_ALIGN_OK

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index df88ce7849e658305f9579e38bcc277746ffbace..0798a8f2da412ddcc7a60dd9fa1d13753db055df 100644 (file)
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -1423,6 +1423,19 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
            gnu_size = NULL_TREE;
          }
 
+       /* If this is an aggregate constant initialized to a constant, force it
+          to be statically allocated.  This saves an initialization copy.  */
+       if (!static_flag
+           && const_flag
+           && gnu_expr
+           && TREE_CONSTANT (gnu_expr)
+           && AGGREGATE_TYPE_P (gnu_type)
+           && tree_fits_uhwi_p (TYPE_SIZE_UNIT (gnu_type))
+           && !(TYPE_IS_PADDING_P (gnu_type)
+                && !tree_fits_uhwi_p (TYPE_SIZE_UNIT
+                                      (TREE_TYPE (TYPE_FIELDS (gnu_type))))))
+         static_flag = true;
+
        /* If this is an aliased object with an unconstrained array nominal
           subtype, we make its type a thin reference, i.e. the reference
           counterpart of a thin pointer, so it points to the array part.
@@ -1474,18 +1487,6 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
                && No (Address_Clause (gnat_entity))))
          gnu_ext_name = create_concat_name (gnat_entity, NULL);
 
-       /* If this is an aggregate constant initialized to a constant, force it
-          to be statically allocated.  This saves an initialization copy.  */
-       if (!static_flag
-           && const_flag
-           && gnu_expr && TREE_CONSTANT (gnu_expr)
-           && AGGREGATE_TYPE_P (gnu_type)
-           && tree_fits_uhwi_p (TYPE_SIZE_UNIT (gnu_type))
-           && !(TYPE_IS_PADDING_P (gnu_type)
-                && !tree_fits_uhwi_p (TYPE_SIZE_UNIT
-                                      (TREE_TYPE (TYPE_FIELDS (gnu_type))))))
-         static_flag = true;
-
        /* Deal with a pragma Linker_Section on a constant or variable.  */
        if ((kind == E_Constant || kind == E_Variable)
            && Present (Linker_Section_Pragma (gnat_entity)))