diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index ad292ee404e..9419d5d2fac 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -2960,9 +2960,8 @@ package body Exp_Ch3 is Defining_Identifier => Acc_Type, Type_Definition => Make_Access_To_Object_Definition (Loc, - All_Present => True, - Null_Exclusion_Present => False, - Subtype_Indication => + All_Present => True, + Subtype_Indication => New_Occurrence_Of (Rec_Type, Loc))))); Set_Handled_Statement_Sequence (Body_Node, diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index 81b2b734bbf..18656ea24fd 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -909,11 +909,10 @@ package body Exp_Ch4 is Defining_Identifier => Def_Id, Type_Definition => Make_Access_To_Object_Definition (Loc, - All_Present => True, - Null_Exclusion_Present => False, - Constant_Present => + All_Present => True, + Constant_Present => Is_Access_Constant (PtrT), - Subtype_Indication => + Subtype_Indication => New_Occurrence_Of (Etype (Exp), Loc)))); -- Inherit the allocation-related attributes from the original diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb index 906ddc4175c..f45c32356a9 100644 --- a/gcc/ada/exp_disp.adb +++ b/gcc/ada/exp_disp.adb @@ -1525,9 +1525,8 @@ package body Exp_Disp is Defining_Identifier => Make_Temporary (Loc, 'T'), Type_Definition => Make_Access_To_Object_Definition (Loc, - All_Present => True, - Null_Exclusion_Present => False, - Subtype_Indication => + All_Present => True, + Subtype_Indication => New_Occurrence_Of (Desig_Typ, Loc))); Stats := New_List ( diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index a24b0704c91..30d3b1bbf4d 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -2431,12 +2431,11 @@ package body Inline is Append_To (Formals, Make_Parameter_Specification (Loc, - Defining_Identifier => + Defining_Identifier => Make_Defining_Identifier (Loc, Chars (Obj_Id)), - In_Present => False, - Out_Present => not Constant_Present (Obj_Decl), - Null_Exclusion_Present => False, - Parameter_Type => Typ_Def)); + In_Present => False, + Out_Present => not Constant_Present (Obj_Decl), + Parameter_Type => Typ_Def)); end Build_Return_Object_Formal; --------------------------------------