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
This commit is contained in:
Eric Botcazou 2012-10-02 10:34:44 +00:00 committed by Eric Botcazou
parent 0f1e88429a
commit f563ce5585
3 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,11 @@
2012-10-02 Eric Botcazou <ebotcazou@adacore.com>
* 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 <dewar@adacore.com> 2012-10-02 Robert Dewar <dewar@adacore.com>
* par_sco.adb, sem_ch3.adb, layout.adb, exp_ch7.adb, exp_imgv.adb, * par_sco.adb, sem_ch3.adb, layout.adb, exp_ch7.adb, exp_imgv.adb,

View File

@ -6165,6 +6165,7 @@ elaborate_expression_1 (tree gnu_expr, Entity_Id gnat_entity, tree gnu_name,
use_variable = expr_variable_p use_variable = expr_variable_p
&& (expr_global_p && (expr_global_p
|| (!optimize || (!optimize
&& definition
&& Is_Itype (gnat_entity) && Is_Itype (gnat_entity)
&& Nkind (Associated_Node_For_Itype (gnat_entity)) && Nkind (Associated_Node_For_Itype (gnat_entity))
== N_Loop_Parameter_Specification)); == N_Loop_Parameter_Specification));

View File

@ -332,7 +332,7 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name ATTRIBUTE_UNUSED,
#ifdef ORDINARY_MAP_INSTANCE #ifdef ORDINARY_MAP_INSTANCE
map = LINEMAPS_ORDINARY_MAP_AT (line_table, i); map = LINEMAPS_ORDINARY_MAP_AT (line_table, i);
if (flag_debug_instances) if (flag_debug_instances)
ORDINARY_MAP_INSTANCE(map) = file_info_ptr[i].Instance; ORDINARY_MAP_INSTANCE (map) = file_info_ptr[i].Instance;
#endif #endif
linemap_line_start (line_table, file_info_ptr[i].Num_Source_Lines, 252); linemap_line_start (line_table, file_info_ptr[i].Num_Source_Lines, 252);
linemap_position_for_column (line_table, 252 - 1); linemap_position_for_column (line_table, 252 - 1);
@ -3158,6 +3158,7 @@ build_return_expr (tree ret_obj, tree ret_val)
if (optimize if (optimize
&& AGGREGATE_TYPE_P (operation_type) && AGGREGATE_TYPE_P (operation_type)
&& !TYPE_IS_FAT_POINTER_P (operation_type) && !TYPE_IS_FAT_POINTER_P (operation_type)
&& TYPE_MODE (operation_type) == BLKmode
&& aggregate_value_p (operation_type, current_function_decl)) && aggregate_value_p (operation_type, current_function_decl))
{ {
/* Recognize the temporary created for a return value with variable /* Recognize the temporary created for a return value with variable