[Ada] Simplify iteration over record components
Commit Message
Iterate over record components with First_Component/Next_Component and
not with First_Entity/Next_Entity.
Change in Sem_Warn unit is related to spurious warning on 'Initialized;
other occurrences of the same pattern were found with grep.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* freeze.adb (Freeze_Entity): Replace First_Entity/Next_Entity
with First_Component/Next_Component; remove condition with Ekind
equal to E_Component.
* sem_ch13.adb (Check_Record_Representation_Clause): Likewise
for component-or-discriminant.
* sem_util.adb (Is_Fully_Initialized_Type): Likewise; rename Ent
to a more specific Comp.
* sem_warn.adb (Check_References): Likewise.
@@ -6328,11 +6328,9 @@ package body Freeze is
-- to the components of Rec.
begin
- Comp := First_Entity (E);
+ Comp := First_Component (E);
while Present (Comp) loop
- if Ekind (Comp) = E_Component
- and then Has_Delayed_Aspects (Comp)
- then
+ if Has_Delayed_Aspects (Comp) then
if not Rec_Pushed then
Push_Scope (E);
Rec_Pushed := True;
@@ -6348,7 +6346,7 @@ package body Freeze is
Analyze_Aspects_At_Freeze_Point (Comp);
end if;
- Next_Entity (Comp);
+ Next_Component (Comp);
end loop;
-- Pop the scope if Rec scope has been pushed on the scope stack
@@ -12284,26 +12284,18 @@ package body Sem_Ch13 is
-- Find maximum bit of any component of the parent type
Parent_Last_Bit := UI_From_Int (System_Address_Size - 1);
- Pcomp := First_Entity (Tagged_Parent);
+ Pcomp := First_Component_Or_Discriminant (Tagged_Parent);
while Present (Pcomp) loop
- if Ekind (Pcomp) in E_Discriminant | E_Component then
- if Present (Component_Bit_Offset (Pcomp))
- and then Known_Static_Esize (Pcomp)
- then
- Parent_Last_Bit :=
- UI_Max
- (Parent_Last_Bit,
- Component_Bit_Offset (Pcomp) + Esize (Pcomp) - 1);
- end if;
- else
-
- -- Skip anonymous types generated for constrained array
- -- or record components.
-
- null;
+ if Present (Component_Bit_Offset (Pcomp))
+ and then Known_Static_Esize (Pcomp)
+ then
+ Parent_Last_Bit :=
+ UI_Max
+ (Parent_Last_Bit,
+ Component_Bit_Offset (Pcomp) + Esize (Pcomp) - 1);
end if;
- Next_Entity (Pcomp);
+ Next_Component_Or_Discriminant (Pcomp);
end loop;
end if;
end;
@@ -17803,15 +17803,14 @@ package body Sem_Util is
-- Otherwise see if all record components are initialized
declare
- Ent : Entity_Id;
+ Comp : Entity_Id;
begin
- Ent := First_Entity (Typ);
- while Present (Ent) loop
- if Ekind (Ent) = E_Component
- and then (No (Parent (Ent))
- or else No (Expression (Parent (Ent))))
- and then not Is_Fully_Initialized_Type (Etype (Ent))
+ Comp := First_Component (Typ);
+ while Present (Comp) loop
+ if (No (Parent (Comp))
+ or else No (Expression (Parent (Comp))))
+ and then not Is_Fully_Initialized_Type (Etype (Comp))
-- Special VM case for tag components, which need to be
-- defined in this case, but are never initialized as VMs
@@ -17819,12 +17818,12 @@ package body Sem_Util is
-- uninitialized case. Note that this applies both to the
-- uTag entry and the main vtable pointer (CPP_Class case).
- and then (Tagged_Type_Expansion or else not Is_Tag (Ent))
+ and then (Tagged_Type_Expansion or else not Is_Tag (Comp))
then
return False;
end if;
- Next_Entity (Ent);
+ Next_Component (Comp);
end loop;
end;
@@ -1548,18 +1548,17 @@ package body Sem_Warn is
Comp : Entity_Id;
begin
- Comp := First_Entity (E1T);
+ Comp := First_Component (E1T);
while Present (Comp) loop
- if Ekind (Comp) = E_Component
- and then Nkind (Parent (Comp)) =
- N_Component_Declaration
+ if Nkind (Parent (Comp)) =
+ N_Component_Declaration
and then No (Expression (Parent (Comp)))
then
Error_Msg_Node_2 := Comp;
exit;
end if;
- Next_Entity (Comp);
+ Next_Component (Comp);
end loop;
end;
end if;