From: Robert Dewar Date: Mon, 12 Dec 2011 13:49:10 +0000 (+0000) Subject: freeze.adb, [...]: Minor reformatting. X-Git-Tag: releases/gcc-4.7.0~1604 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf7bb903f43f72bd5c585665fe471d08f485d430;p=thirdparty%2Fgcc.git freeze.adb, [...]: Minor reformatting. 2011-12-12 Robert Dewar * freeze.adb, s-taprop-mingw.adb, exp_disp.adb, sem_ch13.adb: Minor reformatting. From-SVN: r182241 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 430170d59d2e..560970f3c541 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2011-12-12 Robert Dewar + + * freeze.adb, s-taprop-mingw.adb, exp_disp.adb, sem_ch13.adb: Minor + reformatting. + 2011-12-12 Robert Dewar * sem_ch6.adb, gnatls.adb: Minor reformatting. diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb index a1bd6a425ea0..c836c19adbea 100644 --- a/gcc/ada/exp_disp.adb +++ b/gcc/ada/exp_disp.adb @@ -6513,7 +6513,7 @@ package body Exp_Disp is Append_To (TSD_Aggr_List, Make_Attribute_Reference (Loc, - Prefix => New_Reference_To (Typ, Loc), + Prefix => New_Reference_To (Typ, Loc), Attribute_Name => Name_Alignment)); -- HT_Link @@ -6580,13 +6580,13 @@ package body Exp_Disp is Make_Aggregate (Loc, Expressions => New_List ( - -- Iface_Tag + -- Iface_Tag Make_Attribute_Reference (Loc, Prefix => New_Reference_To (Iface, Loc), Attribute_Name => Name_Tag), - -- OSD + -- OSD Make_OSD (Iface)))); @@ -6658,7 +6658,7 @@ package body Exp_Disp is Append_To (TSD_Aggr_List, Make_Attribute_Reference (Loc, - Prefix => New_Reference_To (SSD, Loc), + Prefix => New_Reference_To (SSD, Loc), Attribute_Name => Name_Unchecked_Access)); else Append_To (TSD_Aggr_List, Make_Null (Loc)); @@ -6674,7 +6674,7 @@ package body Exp_Disp is Append_To (TSD_Tags_List, Make_Attribute_Reference (Loc, - Prefix => New_Reference_To (Typ, Loc), + Prefix => New_Reference_To (Typ, Loc), Attribute_Name => Name_Tag)); -- Fill the rest of the table with the tags of the ancestors @@ -6699,7 +6699,7 @@ package body Exp_Disp is Append_To (TSD_Tags_List, Make_Attribute_Reference (Loc, - Prefix => New_Reference_To (Parent_Typ, Loc), + Prefix => New_Reference_To (Parent_Typ, Loc), Attribute_Name => Name_Tag)); Pos := Pos + 1; @@ -6907,7 +6907,7 @@ package body Exp_Disp is else Tag_Node := Make_Attribute_Reference (Loc, - Prefix => New_Reference_To (Typ, Loc), + Prefix => New_Reference_To (Typ, Loc), Attribute_Name => Name_Tag); end if; @@ -6940,7 +6940,7 @@ package body Exp_Disp is else Tag_Node := Make_Attribute_Reference (Loc, - Prefix => New_Reference_To (Typ, Loc), + Prefix => New_Reference_To (Typ, Loc), Attribute_Name => Name_Tag); end if; @@ -7145,15 +7145,15 @@ package body Exp_Disp is Defining_Identifier => DT_Ptr, Constant_Present => True, Object_Definition => New_Reference_To (RTE (RE_Tag), Loc), - Expression => + Expression => Unchecked_Convert_To (RTE (RE_Tag), Make_Attribute_Reference (Loc, - Prefix => + Prefix => Make_Selected_Component (Loc, - Prefix => New_Reference_To (DT, Loc), - Selector_Name => - New_Occurrence_Of - (RTE_Record_Component (RE_Prims_Ptr), Loc)), + Prefix => New_Reference_To (DT, Loc), + Selector_Name => + New_Occurrence_Of + (RTE_Record_Component (RE_Prims_Ptr), Loc)), Attribute_Name => Name_Address)))); -- Generate the SCIL node for the previous object declaration @@ -7170,16 +7170,16 @@ package body Exp_Disp is Make_Object_Declaration (Loc, Defining_Identifier => Predef_Prims_Ptr, Constant_Present => True, - Object_Definition => New_Reference_To - (RTE (RE_Address), Loc), - Expression => + Object_Definition => + New_Reference_To (RTE (RE_Address), Loc), + Expression => Make_Attribute_Reference (Loc, - Prefix => + Prefix => Make_Selected_Component (Loc, - Prefix => New_Reference_To (DT, Loc), - Selector_Name => - New_Occurrence_Of - (RTE_Record_Component (RE_Predef_Prims), Loc)), + Prefix => New_Reference_To (DT, Loc), + Selector_Name => + New_Occurrence_Of + (RTE_Record_Component (RE_Predef_Prims), Loc)), Attribute_Name => Name_Address))); -- No dispatch table required @@ -7190,15 +7190,16 @@ package body Exp_Disp is Defining_Identifier => DT_Ptr, Constant_Present => True, Object_Definition => New_Reference_To (RTE (RE_Tag), Loc), - Expression => + Expression => Unchecked_Convert_To (RTE (RE_Tag), Make_Attribute_Reference (Loc, - Prefix => + Prefix => Make_Selected_Component (Loc, Prefix => New_Reference_To (DT, Loc), - Selector_Name => - New_Occurrence_Of - (RTE_Record_Component (RE_NDT_Prims_Ptr), Loc)), + Selector_Name => + New_Occurrence_Of + (RTE_Record_Component (RE_NDT_Prims_Ptr), + Loc)), Attribute_Name => Name_Address)))); end if; @@ -7308,15 +7309,17 @@ package body Exp_Disp is Constant_Present => True, Object_Definition => New_Reference_To (RTE (RE_Interface_Tag), Loc), - Expression => + Expression => Unchecked_Convert_To (RTE (RE_Interface_Tag), Make_Attribute_Reference (Loc, - Prefix => + Prefix => Make_Selected_Component (Loc, - Prefix => New_Reference_To (Iface_DT, Loc), - Selector_Name => - New_Occurrence_Of - (RTE_Record_Component (RE_Prims_Ptr), Loc)), + Prefix => + New_Reference_To (Iface_DT, Loc), + Selector_Name => + New_Occurrence_Of + (RTE_Record_Component (RE_Prims_Ptr), + Loc)), Attribute_Name => Name_Address)))); end if; @@ -7660,7 +7663,7 @@ package body Exp_Disp is Address_Node => Unchecked_Convert_To (RTE (RE_Prim_Ptr), Make_Attribute_Reference (Loc, - Prefix => New_Reference_To (Prim, Loc), + Prefix => New_Reference_To (Prim, Loc), Attribute_Name => Name_Unrestricted_Access)))); -- Register copy of the pointer to the 'size primitive in the TSD @@ -7693,7 +7696,7 @@ package body Exp_Disp is Address_Node => Unchecked_Convert_To (RTE (RE_Prim_Ptr), Make_Attribute_Reference (Loc, - Prefix => New_Reference_To (Prim, Loc), + Prefix => New_Reference_To (Prim, Loc), Attribute_Name => Name_Unrestricted_Access)))); end if; end if; @@ -7773,7 +7776,8 @@ package body Exp_Disp is Address_Node => Unchecked_Convert_To (RTE (RE_Prim_Ptr), Make_Attribute_Reference (Loc, - Prefix => New_Reference_To (Alias (Prim), Loc), + Prefix => + New_Reference_To (Alias (Prim), Loc), Attribute_Name => Name_Unrestricted_Access)))); else @@ -7804,7 +7808,8 @@ package body Exp_Disp is Address_Node => Unchecked_Convert_To (RTE (RE_Prim_Ptr), Make_Attribute_Reference (Loc, - Prefix => New_Reference_To (Alias (Prim), Loc), + Prefix => + New_Reference_To (Alias (Prim), Loc), Attribute_Name => Name_Unrestricted_Access)))); end if; diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 46d3c64fd904..2fcd835e121c 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -3040,7 +3040,7 @@ package body Freeze is -- nable and used in subsequent checks, so might as well try to -- compute it. - -- In Ada2012, freeze entities is also used in the front-end to + -- In Ada 2012, Freeze_Entities is also used in the front end to -- trigger the analysis of aspect expressions, so in this case we -- want to continue the freezing process. diff --git a/gcc/ada/s-taprop-mingw.adb b/gcc/ada/s-taprop-mingw.adb index 5ced0315e7bd..c514f0400f4f 100644 --- a/gcc/ada/s-taprop-mingw.adb +++ b/gcc/ada/s-taprop-mingw.adb @@ -698,7 +698,18 @@ package body System.Task_Primitives.Operations is procedure Yield (Do_Yield : Boolean := True) is pragma Unreferenced (Do_Yield); + begin + -- Note: in a previous implementation if Do_Yield was False, then we + -- introduced a delay of 1 millisecond in an attempt to get closer to + -- annex D semantics, and in particular to make ACATS CXD8002 pass. But + -- this change introduced a huge performance regression evaluating the + -- Count attribute. So we decided to remove this processing and just + -- call SwitchToThread unconditionally (leaving Do_Yield unreferenced). + + -- This means that CXD8002 does not pass on Windows, but we cannot + -- guarantee full Annex D compliance on Windows in any case. + SwitchToThread; end Yield; diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 309d2d2ac1bc..bd077364c2d4 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -5881,8 +5881,8 @@ package body Sem_Ch13 is else -- In a generic context the aspect expressions have not been - -- preanalyzed, so do it now. - -- There are no conformance checks to perform in this case. + -- preanalyzed, so do it now. There are no conformance checks + -- to perform in this case. if No (T) then Check_Aspect_At_Freeze_Point (ASN);