diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-06-14 12:49:59 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-06-14 12:49:59 +0200 |
| commit | 2a290fec3d61859b69f865d1769f4e11ac1c3dc8 (patch) | |
| tree | faeb8bf3d0b97c831e30b175c8171f08f0d0f8a7 /gcc/ada/exp_ch7.adb | |
| parent | 758ad97333838b7e5e839100a927b6cadbd030d3 (diff) | |
| download | gcc-2a290fec3d61859b69f865d1769f4e11ac1c3dc8.zip gcc-2a290fec3d61859b69f865d1769f4e11ac1c3dc8.tar.gz gcc-2a290fec3d61859b69f865d1769f4e11ac1c3dc8.tar.bz2 | |
[multiple changes]
2012-06-14 Robert Dewar <dewar@adacore.com>
* exp_ch7.adb, exp_util.adb, sem_aux.ads, exp_ch9.adb,
sem_ch10.adb, freeze.adb, sem_util.adb, exp_ch4.adb,
s-taprop-dummy.adb: Minor reformatting.
2012-06-14 Vincent Pucci <pucci@adacore.com>
* exp_attr.adb (Expand_N_Attribute_Reference): Lock_Free
attribute case added.
* par-prag.adb (Prag): Lock_Free pragma case added.
* sem_attr.adb (Analyze_Attribute_Reference): Lock_Free attribute
case added.
* sem_ch13.adb (Analyze_Aspect_Specifications): Record_Rep_Item
call added for Aspect_Lock_Free.
* sem_ch9.adb (Allows_Lock_Free_Implementation): New Lock_Free
error messages for subprogram bodies.
(Lock_Free_Disabled): New routine.
(Analyze_Protected_Body): Call to Lock_Free_Disabled added.
* sem_prag.adb (Analyze_Pragma): Lock_Free pragma case added.
* snames.adb-tmpl (Get_Pragma_Id): Name_Lock_Free case added.
(Is_Pragma_Name): Name_Lock_Free case added.
* snames.ads-tmpl: Attribute_Lock_Free and Pragma_Lock_Free added.
2012-06-14 Ed Schonberg <schonberg@adacore.com>
* a-coorma.adb, a-cborma.adb, a-cbhama.adb, a-ciorma.adb: Add missing
aliased keyword.
2012-06-14 Bob Duff <duff@adacore.com>
* lib.ads, lib.adb, sem.adb (Write_Unit_Info): Move this
procedure from Sem body to Lib spec, so it can be used for
debugging elsewhere.
2012-06-14 Ed Schonberg <schonberg@adacore.com>
* sem_ch6.adb (Check_Conformance): Add Ada 2012 check on mode
conformance: "aliased" must apply to both or neither formal
parameters.
From-SVN: r188609
Diffstat (limited to 'gcc/ada/exp_ch7.adb')
| -rw-r--r-- | gcc/ada/exp_ch7.adb | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index 4c2af31..a1d5634 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -1892,14 +1892,13 @@ package body Exp_Ch7 is then Processing_Actions (Has_No_Init => True); - -- Processing for intermediate results of conditional - -- expressions where one of the alternatives uses a controlled - -- function call. + -- Process intermediate results of conditional expression with + -- one of the alternatives using a controlled function call. elsif Is_Access_Type (Obj_Typ) and then Present (Status_Flag_Or_Transient_Decl (Obj_Id)) and then Nkind (Status_Flag_Or_Transient_Decl (Obj_Id)) = - N_Defining_Identifier + N_Defining_Identifier and then Present (Expr) and then Nkind (Expr) = N_Null then @@ -2728,7 +2727,7 @@ package body Exp_Ch7 is -- end if; if Nkind (Status_Flag_Or_Transient_Decl (Obj_Id)) = - N_Object_Declaration + N_Object_Declaration then Fin_Stmts := New_List ( Make_If_Statement (Loc, @@ -2736,12 +2735,11 @@ package body Exp_Ch7 is Make_Op_Ne (Loc, Left_Opnd => New_Reference_To (Obj_Id, Loc), Right_Opnd => Make_Null (Loc)), - Then_Statements => Fin_Stmts)); - -- Return objects use a flag to aid their potential - -- finalization when the enclosing function fails to return - -- properly. Generate: + -- Return objects use a flag to aid in processing their + -- potential finalization when the enclosing function fails + -- to return properly. Generate: -- if not Flag then -- <object finalization statements> |