From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 1E7D23857716 for ; Thu, 25 May 2023 08:06:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E7D23857716 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3063433fa66so1222300f8f.3 for ; Thu, 25 May 2023 01:06:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1685001980; x=1687593980; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JR1vSqh1Jpyx2Q57UG4OJ+937SuxAbWmbBXkFhOREjY=; b=edKxxTy148qrmetA/Y0SMODrpOA2v7TTaPOMq0i37vV6ATUN+JkAxktv0cjr/8DWzg zseU31O+/prQ1fWV7+0jEMloe6vu5j2hLG5WIhKZRw8DaY7SLNlY/pNtJ4icyQ/eRBMi +uRhCh5MSxAfc8fhzuAWUkaWMTUmyjELgjlFhhKmlvmcYern9eIe1KvWGnpbK62k4vR2 Ay8wwEdqNAwJJOWPr9T69zeCYTKdygBR2CASuC86IGs+o5k4hHe3Y7okVVAKTYXFC+6b D9iIWVvwYetF6eAO7A4vR7RZvqMm7UtTNlh50d/tim2ReJpsKVz7wW0B8VP75Gy06h+8 ASlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685001980; x=1687593980; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JR1vSqh1Jpyx2Q57UG4OJ+937SuxAbWmbBXkFhOREjY=; b=HZHbzbJd16NXblA0N3vbG9MxnqcDKUFvyBRRuBiZCwuOi3L0Yos3mtOABz7VP88pKF 8N7IYDA64JccfTSAnxLvKRruISf08kYL0dmfB4UOvInck9k1GOhKuA1RfCV3u1wiZlen MgakVXQeLPThUQcOXusZkBQe7iHptjyyhznDbiGKMURYgpRsQMaihBAnCfgs3kzDhM8U 64vZcpBc5KzImBbij6miAJ65EdL65y7KJP7nZO9AvgouSan4fVLMZ+97QtbWRizNPcgx EJPuLvBqHYNsk9sas/rHEFJ/gtWOozSzIDcN/hsMcjzxBSBC1IHQrhQfGGDgXwFofvlb McOg== X-Gm-Message-State: AC+VfDxMBM5VgKM5VDgOsaiPvRZbAGx6RT9PZsbZBJOuUdQ83UfWb92G EH0D9QEFGRXcl3nlUq626o0zvoLHEC+Vc3qkoMOOug== X-Google-Smtp-Source: ACHHUZ7f/SPwCezycYjEubibj2eygUiSjinEeCK7Ko6g3sboWugKDD5ePDLPpgUYmfZMfKJkx7SFAg== X-Received: by 2002:a05:6000:1246:b0:309:49e3:efb4 with SMTP id j6-20020a056000124600b0030949e3efb4mr1474871wrx.63.1685001979889; Thu, 25 May 2023 01:06:19 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id d7-20020a5d6447000000b0030642f5da27sm895294wrw.37.2023.05.25.01.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:06:19 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Fix internal error on declare-expression in post-condition Date: Thu, 25 May 2023 10:06:18 +0200 Message-Id: <20230525080618.1957604-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Eric Botcazou It comes from an incorrect node sharing in the expanded tree. gcc/ada/ * sem_ch3.adb (Find_Type_Of_Object): Copy the object definition when building the subtype declaration in the case of a spec expression. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch3.adb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 1ed590ba519..9e32dea5c02 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -18423,19 +18423,21 @@ package body Sem_Ch3 is Analyze (Subtype_Mark (Obj_Def)); declare - Base_T : constant Entity_Id := Entity (Subtype_Mark (Obj_Def)); - Decl : constant Node_Id := + Base_T : constant Entity_Id := Entity (Subtype_Mark (Obj_Def)); + New_Def : constant Node_Id := New_Copy_Tree (Obj_Def); + Decl : constant Node_Id := Make_Subtype_Declaration (Sloc (P), Defining_Identifier => T, - Subtype_Indication => Relocate_Node (Obj_Def)); + Subtype_Indication => New_Def); + begin Set_Etype (T, Base_T); Mutate_Ekind (T, Subtype_Kind (Ekind (Base_T))); - Set_Parent (T, Obj_Def); + Set_Parent (T, Decl); Set_Scope (T, Current_Scope); if Ekind (T) = E_Array_Subtype then - Constrain_Array (T, Obj_Def, Related_Nod, T, 'P'); + Constrain_Array (T, New_Def, Related_Nod, T, 'P'); elsif Ekind (T) = E_Record_Subtype then Set_First_Entity (T, First_Entity (Base_T)); -- 2.40.0