diff options
Diffstat (limited to 'gcc/ada/exp_disp.adb')
-rw-r--r-- | gcc/ada/exp_disp.adb | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb index 3ac4b3b..43ae2e0 100644 --- a/gcc/ada/exp_disp.adb +++ b/gcc/ada/exp_disp.adb @@ -4052,8 +4052,7 @@ package body Exp_Disp is and then not Is_Abstract_Subprogram (Prim) and then not Is_Eliminated (Prim) and then not Generate_SCIL - and then not - Present (Prim_Table (UI_To_Int (DT_Position (Prim)))) + and then No (Prim_Table (UI_To_Int (DT_Position (Prim)))) then if not Build_Thunks then E := Ultimate_Alias (Prim); @@ -5269,7 +5268,7 @@ package body Exp_Disp is E : Entity_Id; begin - if not Present (Def) + if No (Def) or else Entity (Name (Def)) /= First_Subtype (Typ) then New_Node := @@ -5872,8 +5871,7 @@ package body Exp_Disp is and then not Is_Abstract_Subprogram (Prim) and then not Is_Eliminated (Prim) and then not Generate_SCIL - and then not Present (Prim_Table - (UI_To_Int (DT_Position (Prim)))) + and then No (Prim_Table (UI_To_Int (DT_Position (Prim)))) then E := Ultimate_Alias (Prim); pragma Assert (not Is_Abstract_Subprogram (E)); @@ -6038,7 +6036,7 @@ package body Exp_Disp is -- those are only required to build secondary dispatch -- tables. - and then not Present (Interface_Alias (Prim)) + and then No (Interface_Alias (Prim)) -- Skip abstract and eliminated primitives @@ -7496,7 +7494,7 @@ package body Exp_Disp is -- Primitive associated with a tagged type - if not Present (Interface_Alias (Prim)) then + if No (Interface_Alias (Prim)) then Tag_Typ := Scope (DTC_Entity (Prim)); Pos := DT_Position (Prim); Tag := First_Tag_Component (Tag_Typ); @@ -8023,7 +8021,7 @@ package body Exp_Disp is -- same dispatch table slot, but if it renames an operation in a -- nested package it's a new primitive and will have its own slot. - elsif not Present (Interface_Alias (Prim)) + elsif No (Interface_Alias (Prim)) and then Present (Alias (Prim)) and then Chars (Prim) = Chars (Alias (Prim)) and then Nkind (Unit_Declaration_Node (Prim)) /= @@ -8191,7 +8189,7 @@ package body Exp_Disp is and then Present (Alias (Prim)) and then not Is_Interface (Find_Dispatching_Type (Ultimate_Alias (Prim))) - and then not Present (Interface_Alias (Prim)) + and then No (Interface_Alias (Prim)) and then Is_Derived_Type (Typ) and then In_Private_Part (Current_Scope) and then |