diff options
Diffstat (limited to 'gcc/ada/exp_aggr.adb')
| -rw-r--r-- | gcc/ada/exp_aggr.adb | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index d62b735..0a0c857 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -32,7 +32,6 @@ with Einfo.Entities; use Einfo.Entities; with Einfo.Utils; use Einfo.Utils; with Elists; use Elists; with Errout; use Errout; -with Expander; use Expander; with Exp_Util; use Exp_Util; with Exp_Ch3; use Exp_Ch3; with Exp_Ch6; use Exp_Ch6; @@ -1604,7 +1603,6 @@ package body Exp_Aggr is and then Is_Array_Type (Etype (N)) and then No (Next_Index (Index)) then - Expander_Mode_Save_And_Set (False); Tcopy := New_Copy_Tree (Expr); Set_Parent (Tcopy, N); @@ -1614,9 +1612,10 @@ package body Exp_Aggr is Comp_Typ := Corresponding_Mutably_Tagged_Type (Comp_Typ); end if; - -- For iterated_component_association analyze and resolve - -- the expression with name of the index parameter visible. - -- To manipulate scopes, we use entity of the implicit loop. + -- For iterated_component_association (pre)analyze and + -- resolve the expression with name of the index parameter + -- visible. To manipulate scopes, we use entity of the + -- implicit loop. if Is_Iterated_Component then declare @@ -1625,18 +1624,16 @@ package body Exp_Aggr is begin Push_Scope (Scope (Index_Parameter)); Enter_Name (Index_Parameter); - Analyze_And_Resolve (Tcopy, Comp_Typ); + Preanalyze_And_Resolve (Tcopy, Comp_Typ); End_Scope; end; - -- For ordinary component association, just analyze and + -- For ordinary component association, just (pre)analyze and -- resolve the expression. else - Analyze_And_Resolve (Tcopy, Comp_Typ); + Preanalyze_And_Resolve (Tcopy, Comp_Typ); end if; - - Expander_Mode_Restore; end if; end if; @@ -4914,11 +4911,10 @@ package body Exp_Aggr is -- IP procedure. if Has_Default_Init_Comps (N) - or else Present (Constructor_Name (Ctyp)) + or else Needs_Construction (Ctyp) or else (Is_Access_Type (Ctyp) - and then Present - (Constructor_Name - (Directly_Designated_Type (Ctyp)))) + and then Needs_Construction + (Directly_Designated_Type (Ctyp))) then return; end if; @@ -5781,7 +5777,7 @@ package body Exp_Aggr is Left_Opnd => Duplicate_Subexpr_Move_Checks (Aggr_Lo), Right_Opnd => Duplicate_Subexpr_Move_Checks (Aggr_Hi)); - elsif Is_Signed_Integer_Type (Ind_Typ) then + elsif Has_Overflow_Operations (Ind_Typ) then Cond := Make_Op_Gt (Loc, Left_Opnd => @@ -6401,21 +6397,10 @@ package body Exp_Aggr is Object_Definition => New_Occurrence_Of (Typ, Loc)); Set_No_Initialization (Tmp_Decl, True); - -- If we are within a loop, the temporary will be pushed on the - -- stack at each iteration. If the aggregate is the expression - -- for an allocator, it will be immediately copied to the heap - -- and can be reclaimed at once. We create a transient scope - -- around the aggregate for this purpose. - - if Ekind (Current_Scope) = E_Loop - and then Nkind (Parent_Node) = N_Allocator - then - Establish_Transient_Scope (N, Manage_Sec_Stack => False); - -- If the parent is an assignment for which no controlled actions -- should take place, prevent the temporary from being finalized. - elsif Nkind (Parent_Node) = N_Assignment_Statement + if Nkind (Parent_Node) = N_Assignment_Statement and then No_Ctrl_Actions (Parent_Node) then Mutate_Ekind (Tmp, E_Variable); |