Patchwork [Ada] Couple of minor tweaks

login
register
mail settings
Submitter Eric Botcazou
Date Oct. 2, 2012, 10:27 a.m.
Message ID <8280866.dLmhfYi1ga@polaris>
Download mbox | patch
Permalink /patch/188440/
State New
Headers show

Comments

Eric Botcazou - Oct. 2, 2012, 10:27 a.m.
This avoids applying the NRV optimization for small structures and creating 
useless elaboration variables for loops.

Tested on x86_64-suse-linux, applied on the mainline and 4.7 branch.


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.

Patch

Index: gcc-interface/decl.c
===================================================================
--- gcc-interface/decl.c	(revision 191953)
+++ gcc-interface/decl.c	(working copy)
@@ -6165,6 +6165,7 @@  elaborate_expression_1 (tree gnu_expr, E
   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));
Index: gcc-interface/trans.c
===================================================================
--- gcc-interface/trans.c	(revision 191953)
+++ gcc-interface/trans.c	(working copy)
@@ -332,7 +332,7 @@  gigi (Node_Id gnat_root, int max_gnat_no
 #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 re
       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