From aa4997841cb29b30253449c8efc85446072b5a53 Mon Sep 17 00:00:00 2001 From: Ed Schonberg Date: Mon, 4 Aug 2014 10:08:26 +0000 Subject: [PATCH] exp_ch5.adb: minor reformatting. 2014-08-04 Ed Schonberg * exp_ch5.adb: minor reformatting. * einfo.ads, einfo.adb (Is_Processed_Transient): Applies to loop parameters. From-SVN: r213559 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/einfo.adb | 4 ++-- gcc/ada/einfo.ads | 12 ++++++++---- gcc/ada/exp_ch5.adb | 1 - 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 5db6af9fe44..d18302471d3 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2014-08-04 Ed Schonberg + + * exp_ch5.adb: minor reformatting. + * einfo.ads, einfo.adb (Is_Processed_Transient): Applies to loop + parameters. + 2014-08-04 Thomas Quinot * s-fatgen.adb: Minor reformatting. diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb index f63e6fa850f..cecdabe9d00 100644 --- a/gcc/ada/einfo.adb +++ b/gcc/ada/einfo.adb @@ -2292,7 +2292,7 @@ package body Einfo is function Is_Processed_Transient (Id : E) return B is begin - pragma Assert (Ekind_In (Id, E_Constant, E_Variable)); + pragma Assert (Ekind_In (Id, E_Constant, E_Loop_Parameter, E_Variable)); return Flag252 (Id); end Is_Processed_Transient; @@ -5096,7 +5096,7 @@ package body Einfo is procedure Set_Is_Processed_Transient (Id : E; V : B := True) is begin - pragma Assert (Ekind_In (Id, E_Constant, E_Variable)); + pragma Assert (Ekind_In (Id, E_Constant, E_Loop_Parameter, E_Variable)); Set_Flag252 (Id, V); end Set_Is_Processed_Transient; diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index c87a9899a00..7dd8257e009 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -2402,6 +2402,9 @@ package Einfo is -- Defined in all type and subtype entities. Set in the subtype -- declaration that renames the generic formal as a subtype of the -- actual. Guarantees that the subtype is not static within the instance. +-- Also used during analysis of an instance, to simplify resolution of +-- accidental overloading that occurs when different formal types get the +-- same actual. -- Is_Generic_Instance (Flag130) -- Defined in all entities. Set to indicate that the entity is an @@ -2841,10 +2844,11 @@ package Einfo is -- as well as for record with private types as subtypes -- Is_Processed_Transient (Flag252) --- Defined in entities of variables and constants. Set when a transient --- object needs to be finalized and it has already been processed by the --- transient scope machinery. This flag signals the general finalization --- mechanism to ignore the transient object. +-- Defined in entities of variables and constants, including the loop +-- parameters of generalized iterators. Set when a transient object needs +-- to be finalized and it has already been processed by the transient +-- scope machinery. This flag signals the general finalization mechanism +-- to ignore the transient object. -- Is_Protected_Component (synthesized) -- Applicable to all entities, true if the entity denotes a private diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb index 591e1d3d56c..363279580a2 100644 --- a/gcc/ada/exp_ch5.adb +++ b/gcc/ada/exp_ch5.adb @@ -3482,7 +3482,6 @@ package body Exp_Ch5 is else Cursor := Id; - -- Set_Ekind (Cursor, E_Variable); end if; Iterator := Make_Temporary (Loc, 'I'); -- 2.30.2