From e2d87663af0bfcd0563c00f958082dd7d801175d Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 5 May 2020 10:54:56 +0200 Subject: [PATCH] [Ada] Small cleanup throughout Exp_Ch9 gcc/ada/ * exp_ch9.adb (Is_Potentially_Large_Family): Add documentation. (Actual_Index_Expression): Use Entry_Index_Type. (Build_Entry_Count_Expression): Likewise. (Build_Find_Body_Index): Likewise. (Collect_Entry_Families): Likewise. Use directly the bounds of the index type to find out whether the family is large. (Entry_Index_Expression): Likewise. --- gcc/ada/exp_ch9.adb | 51 +++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb index eaf743e5863..945e1098b3d 100644 --- a/gcc/ada/exp_ch9.adb +++ b/gcc/ada/exp_ch9.adb @@ -434,6 +434,8 @@ package body Exp_Ch9 is Conctyp : Entity_Id; Lo : Node_Id; Hi : Node_Id) return Boolean; + -- Determine whether an entry family is potentially large because one of + -- its bounds denotes a discrminant. function Is_Private_Primitive_Subprogram (Id : Entity_Id) return Boolean; -- Determine whether Id is a function or a procedure and is marked as a @@ -585,7 +587,7 @@ package body Exp_Ch9 is -- structure. if Present (Index) then - S := Etype (Discrete_Subtype_Definition (Declaration_Node (Ent))); + S := Entry_Index_Type (Ent); Expr := Make_Op_Add (Sloc, @@ -612,8 +614,7 @@ package body Exp_Ch9 is Set_Intval (Num, Intval (Num) + 1); elsif Ekind (Prev) = E_Entry_Family then - S := - Etype (Discrete_Subtype_Definition (Declaration_Node (Prev))); + S := Entry_Index_Type (Prev); -- The need for the following full view retrieval stems from this -- complex case of nested generics and tasking: @@ -1702,7 +1703,7 @@ package body Exp_Ch9 is Next (Comp); end loop; - Typ := Etype (Discrete_Subtype_Definition (Parent (Ent))); + Typ := Entry_Index_Type (Ent); Hi := Type_High_Bound (Typ); Lo := Type_Low_Bound (Typ); Large := Is_Potentially_Large_Family @@ -2761,7 +2762,7 @@ package body Exp_Ch9 is Add_If_Clause (Make_Integer_Literal (Loc, 1)); elsif Ekind (Ent) = E_Entry_Family then - E_Typ := Etype (Discrete_Subtype_Definition (Parent (Ent))); + E_Typ := Entry_Index_Type (Ent); Hi := Convert_Discriminant_Ref (Type_High_Bound (E_Typ)); Lo := Convert_Discriminant_Ref (Type_Low_Bound (E_Typ)); Add_If_Clause (Family_Size (Loc, Hi, Lo, Typ, False)); @@ -5189,23 +5190,21 @@ package body Exp_Ch9 is Efam_Type := Make_Temporary (Loc, 'F'); declare - Bas : Entity_Id := - Base_Type - (Etype (Discrete_Subtype_Definition (Parent (Efam)))); - - Bas_Decl : Node_Id := Empty; - Lo, Hi : Node_Id; + Eityp : constant Entity_Id := Entry_Index_Type (Efam); + Lo : constant Node_Id := Type_Low_Bound (Eityp); + Hi : constant Node_Id := Type_High_Bound (Eityp); + Bdecl : Node_Id; + Bityp : Entity_Id; begin - Get_Index_Bounds - (Discrete_Subtype_Definition (Parent (Efam)), Lo, Hi); + Bityp := Base_Type (Eityp); - if Is_Potentially_Large_Family (Bas, Conctyp, Lo, Hi) then - Bas := Make_Temporary (Loc, 'B'); + if Is_Potentially_Large_Family (Bityp, Conctyp, Lo, Hi) then + Bityp := Make_Temporary (Loc, 'B'); - Bas_Decl := + Bdecl := Make_Subtype_Declaration (Loc, - Defining_Identifier => Bas, + Defining_Identifier => Bityp, Subtype_Indication => Make_Subtype_Indication (Loc, Subtype_Mark => @@ -5218,9 +5217,9 @@ package body Exp_Ch9 is Make_Integer_Literal (Loc, Entry_Family_Bound - 1))))); - Insert_After (Current_Node, Bas_Decl); - Current_Node := Bas_Decl; - Analyze (Bas_Decl); + Insert_After (Current_Node, Bdecl); + Current_Node := Bdecl; + Analyze (Bdecl); end if; Efam_Decl := @@ -5229,7 +5228,7 @@ package body Exp_Ch9 is Type_Definition => Make_Unconstrained_Array_Definition (Loc, Subtype_Marks => - (New_List (New_Occurrence_Of (Bas, Loc))), + (New_List (New_Occurrence_Of (Bityp, Loc))), Component_Definition => Make_Component_Definition (Loc, @@ -5258,10 +5257,8 @@ package body Exp_Ch9 is Constraint => Make_Index_Or_Discriminant_Constraint (Loc, Constraints => New_List ( - New_Occurrence_Of - (Etype (Discrete_Subtype_Definition - (Parent (Efam))), Loc))))))); - + New_Occurrence_Of (Entry_Index_Type (Efam), + Loc))))))); end if; Next_Entity (Efam); @@ -5625,7 +5622,7 @@ package body Exp_Ch9 is -- using the index subtype which may mention a discriminant. if Present (Index) then - S := Etype (Discrete_Subtype_Definition (Declaration_Node (Ent))); + S := Entry_Index_Type (Ent); Expr := Make_Op_Add (Sloc, @@ -5655,7 +5652,7 @@ package body Exp_Ch9 is Set_Intval (Num, Intval (Num) + 1); elsif Ekind (Prev) = E_Entry_Family then - S := Etype (Discrete_Subtype_Definition (Declaration_Node (Prev))); + S := Entry_Index_Type (Prev); Lo := Type_Low_Bound (S); Hi := Type_High_Bound (S); -- 2.30.2