===================================================================
@@ -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));
===================================================================
@@ -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