decl.c (elaborate_expression_1): When optimization is disabled, use the variable...

	* gcc-interface/decl.c (elaborate_expression_1): When optimization is
	disabled, use the variable for bounds of loop iteration scheme.

From-SVN: r171220

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 46e4e22f2c9922b41a060d05965390292ff83e26..a61c1e69e703d602207fa8f5b8952b1415007fda 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,8 +1,12 @@
+2011-03-21  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/decl.c (elaborate_expression_1): When optimization is
+       disabled, use the variable for bounds of loop iteration scheme.
+
 2011-03-21  Kai Tietz  <ktietz@redhat.com>
 
        PR target/12171
-       * gcc-interface/utils.c (gnat_internal_attribute_table):
-       Add new element.
+       * gcc-interface/utils.c (gnat_internal_attribute_table): Add new column
 
 2011-03-17  Eric Botcazou  <ebotcazou@adacore.com>
 

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 696e49a703bbfc1ab671bc10bfed14b9e9b9a4a6..f254ac4d0fc934c16f5fac542af5ee45d93ce781 100644 (file)
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -6004,7 +6004,7 @@ elaborate_expression_1 (tree gnu_expr, Entity_Id gnat_entity, tree gnu_name,
                        bool definition, bool need_debug)
 {
   const bool expr_global_p = Is_Public (gnat_entity) || global_bindings_p ();
-  bool expr_variable_p;
+  bool expr_variable_p, use_variable;
   tree gnu_decl;
 
   /* In most cases, we won't see a naked FIELD_DECL because a discriminant
@@ -6058,8 +6058,18 @@ elaborate_expression_1 (tree gnu_expr, Entity_Id gnat_entity, tree gnu_name,
            && (TREE_READONLY (inner) || DECL_READONLY_ONCE_ELAB (inner)));
     }
 
-  /* Now create the variable if we need it.  */
-  if (need_debug || (expr_variable_p && expr_global_p))
+  /* We only need to use the variable if we are in a global context since GCC
+     can do the right thing in the local case.  However, when not optimizing,
+     use it for bounds of loop iteration scheme to avoid code duplication.  */
+  use_variable = expr_variable_p
+                && (expr_global_p
+                    || (!optimize
+                        && Is_Itype (gnat_entity)
+                        && Nkind (Associated_Node_For_Itype (gnat_entity))
+                           == N_Loop_Parameter_Specification));
+
+  /* Now create it, possibly only for debugging purposes.  */
+  if (use_variable || need_debug)
     gnu_decl
       = create_var_decl (create_concat_name (gnat_entity,
                                             IDENTIFIER_POINTER (gnu_name)),
@@ -6067,9 +6077,7 @@ elaborate_expression_1 (tree gnu_expr, Entity_Id gnat_entity, tree gnu_name,
                         !need_debug, Is_Public (gnat_entity),
                         !definition, expr_global_p, NULL, gnat_entity);
 
-  /* We only need to use this variable if we are in global context since GCC
-     can do the right thing in the local case.  */
-  if (expr_global_p && expr_variable_p)
+  if (use_variable)
     return gnu_decl;
 
   return expr_variable_p ? gnat_save_expr (gnu_expr) : gnu_expr;