From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id D7DD43839C49; Wed, 11 May 2022 08:56:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D7DD43839C49 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-307] [Ada] Do not create useless itype in Constrain_Access X-Act-Checkin: gcc X-Git-Author: Etienne Servais X-Git-Refname: refs/heads/master X-Git-Oldrev: dc9ecb41c8572c53bdcd86e73526e2a27bd3dff9 X-Git-Newrev: e6f7d5ff4f990c8f614c654353a3aa843f009349 Message-Id: <20220511085604.D7DD43839C49@sourceware.org> Date: Wed, 11 May 2022 08:56:04 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2022 08:56:04 -0000 https://gcc.gnu.org/g:e6f7d5ff4f990c8f614c654353a3aa843f009349 commit r13-307-ge6f7d5ff4f990c8f614c654353a3aa843f009349 Author: Etienne Servais Date: Wed Feb 2 15:18:29 2022 +0100 [Ada] Do not create useless itype in Constrain_Access In the case of a constrained access definition for a record component we are calling create_itype twice the former not being updated. This leads to a malformed node that crashes -gnatG when predicates are activated. Instead of creating a default Itype for Desig_Subtype, create it with the correct scope in each case. gcc/ada/ * sem_ch3.adb (Constrain_Access): Call Desig_Subtype in each if branch to avoid calling it twice. Diff: --- gcc/ada/sem_ch3.adb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index d4464e2b8c9..6559c8fc7b7 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -13345,11 +13345,12 @@ package body Sem_Ch3 is is T : constant Entity_Id := Entity (Subtype_Mark (S)); Desig_Type : constant Entity_Id := Designated_Type (T); - Desig_Subtype : Entity_Id := Create_Itype (E_Void, Related_Nod); + Desig_Subtype : Entity_Id; Constraint_OK : Boolean := True; begin if Is_Array_Type (Desig_Type) then + Desig_Subtype := Create_Itype (E_Void, Related_Nod); Constrain_Array (Desig_Subtype, S, Related_Nod, Def_Id, 'P'); elsif (Is_Record_Type (Desig_Type) @@ -13445,12 +13446,14 @@ package body Sem_Ch3 is end; end if; + Desig_Subtype := Create_Itype (E_Void, Related_Nod); Constrain_Discriminated_Type (Desig_Subtype, S, Related_Nod, For_Access => True); elsif Is_Concurrent_Type (Desig_Type) and then not Is_Constrained (Desig_Type) then + Desig_Subtype := Create_Itype (E_Void, Related_Nod); Constrain_Concurrent (Desig_Subtype, S, Related_Nod, Desig_Type, ' '); else