Skip to content

R
riscv-gcc-1
Commit cf7bb903 by Robert Dewar Committed by Arnaud Charlet
Options

freeze.adb, [...]: Minor reformatting. 

2011-12-12  Robert Dewar  <dewar@adacore.com>

	* freeze.adb, s-taprop-mingw.adb, exp_disp.adb, sem_ch13.adb: Minor
	reformatting.

From-SVN: r182241
parent e876c43a
Showing with 61 additions and 40 deletions
gcc/ada/ChangeLog
2011-12-12 Robert Dewar <dewar@adacore.com> 2011-12-12 Robert Dewar <dewar@adacore.com>
* freeze.adb, s-taprop-mingw.adb, exp_disp.adb, sem_ch13.adb: Minor
reformatting.
2011-12-12 Robert Dewar <dewar@adacore.com>
* sem_ch6.adb, gnatls.adb: Minor reformatting. * sem_ch6.adb, gnatls.adb: Minor reformatting.
2011-12-12 Ed Schonberg <schonberg@adacore.com> 2011-12-12 Ed Schonberg <schonberg@adacore.com>
......
gcc/ada/exp_disp.adb
...@@ -6513,7 +6513,7 @@ package body Exp_Disp is ...@@ -6513,7 +6513,7 @@ package body Exp_Disp is
Append_To (TSD_Aggr_List, Append_To (TSD_Aggr_List,
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (Typ, Loc), Prefix => New_Reference_To (Typ, Loc),
Attribute_Name => Name_Alignment)); Attribute_Name => Name_Alignment));
-- HT_Link -- HT_Link
...@@ -6580,13 +6580,13 @@ package body Exp_Disp is ...@@ -6580,13 +6580,13 @@ package body Exp_Disp is
Make_Aggregate (Loc, Make_Aggregate (Loc,
Expressions => New_List ( Expressions => New_List (
-- Iface_Tag -- Iface_Tag
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (Iface, Loc), Prefix => New_Reference_To (Iface, Loc),
Attribute_Name => Name_Tag), Attribute_Name => Name_Tag),
-- OSD -- OSD
Make_OSD (Iface)))); Make_OSD (Iface))));
...@@ -6658,7 +6658,7 @@ package body Exp_Disp is ...@@ -6658,7 +6658,7 @@ package body Exp_Disp is
Append_To (TSD_Aggr_List, Append_To (TSD_Aggr_List,
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (SSD, Loc), Prefix => New_Reference_To (SSD, Loc),
Attribute_Name => Name_Unchecked_Access)); Attribute_Name => Name_Unchecked_Access));
else else
Append_To (TSD_Aggr_List, Make_Null (Loc)); Append_To (TSD_Aggr_List, Make_Null (Loc));
...@@ -6674,7 +6674,7 @@ package body Exp_Disp is ...@@ -6674,7 +6674,7 @@ package body Exp_Disp is
Append_To (TSD_Tags_List, Append_To (TSD_Tags_List,
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (Typ, Loc), Prefix => New_Reference_To (Typ, Loc),
Attribute_Name => Name_Tag)); Attribute_Name => Name_Tag));
-- Fill the rest of the table with the tags of the ancestors -- Fill the rest of the table with the tags of the ancestors
...@@ -6699,7 +6699,7 @@ package body Exp_Disp is ...@@ -6699,7 +6699,7 @@ package body Exp_Disp is
Append_To (TSD_Tags_List, Append_To (TSD_Tags_List,
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (Parent_Typ, Loc), Prefix => New_Reference_To (Parent_Typ, Loc),
Attribute_Name => Name_Tag)); Attribute_Name => Name_Tag));
Pos := Pos + 1; Pos := Pos + 1;
...@@ -6907,7 +6907,7 @@ package body Exp_Disp is ...@@ -6907,7 +6907,7 @@ package body Exp_Disp is
else else
Tag_Node := Tag_Node :=
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (Typ, Loc), Prefix => New_Reference_To (Typ, Loc),
Attribute_Name => Name_Tag); Attribute_Name => Name_Tag);
end if; end if;
...@@ -6940,7 +6940,7 @@ package body Exp_Disp is ...@@ -6940,7 +6940,7 @@ package body Exp_Disp is
else else
Tag_Node := Tag_Node :=
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (Typ, Loc), Prefix => New_Reference_To (Typ, Loc),
Attribute_Name => Name_Tag); Attribute_Name => Name_Tag);
end if; end if;
...@@ -7145,15 +7145,15 @@ package body Exp_Disp is ...@@ -7145,15 +7145,15 @@ package body Exp_Disp is
Defining_Identifier => DT_Ptr, Defining_Identifier => DT_Ptr,
Constant_Present => True, Constant_Present => True,
Object_Definition => New_Reference_To (RTE (RE_Tag), Loc), Object_Definition => New_Reference_To (RTE (RE_Tag), Loc),
Expression => Expression =>
Unchecked_Convert_To (RTE (RE_Tag), Unchecked_Convert_To (RTE (RE_Tag),
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => Prefix =>
Make_Selected_Component (Loc, Make_Selected_Component (Loc,
Prefix => New_Reference_To (DT, Loc), Prefix => New_Reference_To (DT, Loc),
Selector_Name => Selector_Name =>
New_Occurrence_Of New_Occurrence_Of
(RTE_Record_Component (RE_Prims_Ptr), Loc)), (RTE_Record_Component (RE_Prims_Ptr), Loc)),
Attribute_Name => Name_Address)))); Attribute_Name => Name_Address))));
-- Generate the SCIL node for the previous object declaration -- Generate the SCIL node for the previous object declaration
...@@ -7170,16 +7170,16 @@ package body Exp_Disp is ...@@ -7170,16 +7170,16 @@ package body Exp_Disp is
Make_Object_Declaration (Loc, Make_Object_Declaration (Loc,
Defining_Identifier => Predef_Prims_Ptr, Defining_Identifier => Predef_Prims_Ptr,
Constant_Present => True, Constant_Present => True,
Object_Definition => New_Reference_To Object_Definition =>
(RTE (RE_Address), Loc), New_Reference_To (RTE (RE_Address), Loc),
Expression => Expression =>
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => Prefix =>
Make_Selected_Component (Loc, Make_Selected_Component (Loc,
Prefix => New_Reference_To (DT, Loc), Prefix => New_Reference_To (DT, Loc),
Selector_Name => Selector_Name =>
New_Occurrence_Of New_Occurrence_Of
(RTE_Record_Component (RE_Predef_Prims), Loc)), (RTE_Record_Component (RE_Predef_Prims), Loc)),
Attribute_Name => Name_Address))); Attribute_Name => Name_Address)));
-- No dispatch table required -- No dispatch table required
...@@ -7190,15 +7190,16 @@ package body Exp_Disp is ...@@ -7190,15 +7190,16 @@ package body Exp_Disp is
Defining_Identifier => DT_Ptr, Defining_Identifier => DT_Ptr,
Constant_Present => True, Constant_Present => True,
Object_Definition => New_Reference_To (RTE (RE_Tag), Loc), Object_Definition => New_Reference_To (RTE (RE_Tag), Loc),
Expression => Expression =>
Unchecked_Convert_To (RTE (RE_Tag), Unchecked_Convert_To (RTE (RE_Tag),
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => Prefix =>
Make_Selected_Component (Loc, Make_Selected_Component (Loc,
Prefix => New_Reference_To (DT, Loc), Prefix => New_Reference_To (DT, Loc),
Selector_Name => Selector_Name =>
New_Occurrence_Of New_Occurrence_Of
(RTE_Record_Component (RE_NDT_Prims_Ptr), Loc)), (RTE_Record_Component (RE_NDT_Prims_Ptr),
Loc)),
Attribute_Name => Name_Address)))); Attribute_Name => Name_Address))));
end if; end if;
...@@ -7308,15 +7309,17 @@ package body Exp_Disp is ...@@ -7308,15 +7309,17 @@ package body Exp_Disp is
Constant_Present => True, Constant_Present => True,
Object_Definition => New_Reference_To Object_Definition => New_Reference_To
(RTE (RE_Interface_Tag), Loc), (RTE (RE_Interface_Tag), Loc),
Expression => Expression =>
Unchecked_Convert_To (RTE (RE_Interface_Tag), Unchecked_Convert_To (RTE (RE_Interface_Tag),
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => Prefix =>
Make_Selected_Component (Loc, Make_Selected_Component (Loc,
Prefix => New_Reference_To (Iface_DT, Loc), Prefix =>
Selector_Name => New_Reference_To (Iface_DT, Loc),
New_Occurrence_Of Selector_Name =>
(RTE_Record_Component (RE_Prims_Ptr), Loc)), New_Occurrence_Of
(RTE_Record_Component (RE_Prims_Ptr),
Loc)),
Attribute_Name => Name_Address)))); Attribute_Name => Name_Address))));
end if; end if;
...@@ -7660,7 +7663,7 @@ package body Exp_Disp is ...@@ -7660,7 +7663,7 @@ package body Exp_Disp is
Address_Node => Address_Node =>
Unchecked_Convert_To (RTE (RE_Prim_Ptr), Unchecked_Convert_To (RTE (RE_Prim_Ptr),
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (Prim, Loc), Prefix => New_Reference_To (Prim, Loc),
Attribute_Name => Name_Unrestricted_Access)))); Attribute_Name => Name_Unrestricted_Access))));
-- Register copy of the pointer to the 'size primitive in the TSD -- Register copy of the pointer to the 'size primitive in the TSD
...@@ -7693,7 +7696,7 @@ package body Exp_Disp is ...@@ -7693,7 +7696,7 @@ package body Exp_Disp is
Address_Node => Address_Node =>
Unchecked_Convert_To (RTE (RE_Prim_Ptr), Unchecked_Convert_To (RTE (RE_Prim_Ptr),
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (Prim, Loc), Prefix => New_Reference_To (Prim, Loc),
Attribute_Name => Name_Unrestricted_Access)))); Attribute_Name => Name_Unrestricted_Access))));
end if; end if;
end if; end if;
...@@ -7773,7 +7776,8 @@ package body Exp_Disp is ...@@ -7773,7 +7776,8 @@ package body Exp_Disp is
Address_Node => Address_Node =>
Unchecked_Convert_To (RTE (RE_Prim_Ptr), Unchecked_Convert_To (RTE (RE_Prim_Ptr),
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (Alias (Prim), Loc), Prefix =>
New_Reference_To (Alias (Prim), Loc),
Attribute_Name => Name_Unrestricted_Access)))); Attribute_Name => Name_Unrestricted_Access))));
else else
...@@ -7804,7 +7808,8 @@ package body Exp_Disp is ...@@ -7804,7 +7808,8 @@ package body Exp_Disp is
Address_Node => Address_Node =>
Unchecked_Convert_To (RTE (RE_Prim_Ptr), Unchecked_Convert_To (RTE (RE_Prim_Ptr),
Make_Attribute_Reference (Loc, Make_Attribute_Reference (Loc,
Prefix => New_Reference_To (Alias (Prim), Loc), Prefix =>
New_Reference_To (Alias (Prim), Loc),
Attribute_Name => Name_Unrestricted_Access)))); Attribute_Name => Name_Unrestricted_Access))));
end if; end if;
......
gcc/ada/freeze.adb
...@@ -3040,7 +3040,7 @@ package body Freeze is ...@@ -3040,7 +3040,7 @@ package body Freeze is
-- nable and used in subsequent checks, so might as well try to -- nable and used in subsequent checks, so might as well try to
-- compute it. -- 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 -- trigger the analysis of aspect expressions, so in this case we
-- want to continue the freezing process. -- want to continue the freezing process.
......
gcc/ada/s-taprop-mingw.adb
...@@ -698,7 +698,18 @@ package body System.Task_Primitives.Operations is ...@@ -698,7 +698,18 @@ package body System.Task_Primitives.Operations is
procedure Yield (Do_Yield : Boolean := True) is procedure Yield (Do_Yield : Boolean := True) is
pragma Unreferenced (Do_Yield); pragma Unreferenced (Do_Yield);
begin 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; SwitchToThread;
end Yield; end Yield;
......
gcc/ada/sem_ch13.adb
...@@ -5881,8 +5881,8 @@ package body Sem_Ch13 is ...@@ -5881,8 +5881,8 @@ package body Sem_Ch13 is
else else
-- In a generic context the aspect expressions have not been -- In a generic context the aspect expressions have not been
-- preanalyzed, so do it now. -- preanalyzed, so do it now. There are no conformance checks
-- There are no conformance checks to perform in this case. -- to perform in this case.
if No (T) then if No (T) then
Check_Aspect_At_Freeze_Point (ASN); Check_Aspect_At_Freeze_Point (ASN);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment