From f563ce55854c93f9a2b7075d5f84fc6301d41c30 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 2 Oct 2012 10:34:44 +0000 Subject: [PATCH] decl.c (elaborate_expression_1): Use the variable for bounds of loop iteraration scheme only for locally defined... * gcc-interfaces/decl.c (elaborate_expression_1): Use the variable for bounds of loop iteraration scheme only for locally defined subtypes. * gcc-interface/trans.c (gigi): Fix formatting. (build_return_expr): Apply the NRV optimization only for BLKmode. From-SVN: r191971 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/gcc-interface/decl.c | 1 + gcc/ada/gcc-interface/trans.c | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 8fd7724cb85..cddd55b7801 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2012-10-02 Eric Botcazou + + * gcc-interfaces/decl.c (elaborate_expression_1): Use the variable for + bounds of loop iteraration scheme only for locally defined subtypes. + + * gcc-interface/trans.c (gigi): Fix formatting. + (build_return_expr): Apply the NRV optimization only for BLKmode. + 2012-10-02 Robert Dewar * par_sco.adb, sem_ch3.adb, layout.adb, exp_ch7.adb, exp_imgv.adb, diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 9e14d8af1bf..3935bb33e05 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -6165,6 +6165,7 @@ elaborate_expression_1 (tree gnu_expr, Entity_Id gnat_entity, tree gnu_name, use_variable = expr_variable_p && (expr_global_p || (!optimize + && definition && Is_Itype (gnat_entity) && Nkind (Associated_Node_For_Itype (gnat_entity)) == N_Loop_Parameter_Specification)); diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index c3e833e408a..d88f6bafcda 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -332,7 +332,7 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name ATTRIBUTE_UNUSED, #ifdef ORDINARY_MAP_INSTANCE map = LINEMAPS_ORDINARY_MAP_AT (line_table, i); if (flag_debug_instances) - ORDINARY_MAP_INSTANCE(map) = file_info_ptr[i].Instance; + ORDINARY_MAP_INSTANCE (map) = file_info_ptr[i].Instance; #endif linemap_line_start (line_table, file_info_ptr[i].Num_Source_Lines, 252); linemap_position_for_column (line_table, 252 - 1); @@ -3158,6 +3158,7 @@ build_return_expr (tree ret_obj, tree ret_val) if (optimize && AGGREGATE_TYPE_P (operation_type) && !TYPE_IS_FAT_POINTER_P (operation_type) + && TYPE_MODE (operation_type) == BLKmode && aggregate_value_p (operation_type, current_function_decl)) { /* Recognize the temporary created for a return value with variable