From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1285) id C25D038654A3; Wed, 27 Sep 2023 08:27:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C25D038654A3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1695803270; bh=3PxTEWNIzuTBXbHFbeIUgd4rxDiVZTTRqrjobM3fn0I=; h=From:To:Subject:Date:From; b=pNAR8P6EkKUzUArKwnr3oHsajff0c+rhAhjSgK2lJeIphhTQht/GPiec7CuojARed /HsKqDr8/y4R1DnyAQwU7dRvT1yG6FYa/QnX57vZNj6SMmnf0h3JS0a3wyogpZUIm1 LsSzkl5yLKC/F8uo7eX+lJTbxU1QILv9wtZv1oG8= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Eric Botcazou To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-7898] ada: Fix assertion failure introduced by latest change X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: e68906c444e6488960908c89c26ebdba67b6f2cb X-Git-Newrev: 82bf3afa68a4ba433a86d72e5386dec73938891a Message-Id: <20230927082750.C25D038654A3@sourceware.org> Date: Wed, 27 Sep 2023 08:27:50 +0000 (GMT) List-Id: https://gcc.gnu.org/g:82bf3afa68a4ba433a86d72e5386dec73938891a commit r13-7898-g82bf3afa68a4ba433a86d72e5386dec73938891a Author: Eric Botcazou Date: Wed Jul 5 19:49:40 2023 +0200 ada: Fix assertion failure introduced by latest change The new processing is not properly guarded. gcc/ada/ * sem_ch13.adb (Replace_Type_References_Generic.Visible_Component): In the case of private discriminated types, explicitly check that we have a private declaration before examining its discriminant part. Diff: --- gcc/ada/sem_ch13.adb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index d66255cdd9e..b81b6b02e1d 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -15463,8 +15463,6 @@ package body Sem_Ch13 is elsif Is_Private_Type (T) and then Has_Discriminants (T) then declare Decl : constant Node_Id := Declaration_Node (T); - Spec : constant List_Id := - Discriminant_Specifications (Original_Node (Decl)); Discr : Node_Id; @@ -15474,8 +15472,11 @@ package body Sem_Ch13 is -- name; then, if it exists, return the discriminant entity of -- the same name in the type, which is that of its full view. - if Present (Spec) then - Discr := First (Spec); + if Nkind (Decl) in N_Private_Extension_Declaration + | N_Private_Type_Declaration + and then Present (Discriminant_Specifications (Decl)) + then + Discr := First (Discriminant_Specifications (Decl)); while Present (Discr) loop if Chars (Defining_Identifier (Discr)) = Comp then