From patchwork Tue May 17 08:27:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 54080 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 592483857349 for ; Tue, 17 May 2022 08:47:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 592483857349 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652777261; bh=ZLYluYFTs0Z6CNzLAxyPjW/qApKVQ7+5r8ygjpCB+Dc=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=UwjmKKNv7DWGodnn9BEbCAT5Gn/+FAz9oVtVf1mZJixjGF9WuYHExdwbXYkPwpMBD 9A0xWc17jSu8oDMQLY+bChHLTubKO+QMxWH1vDr+nr8ElIw6t0+7YInLLqEpKg9f8m cOYA+OPILS6j+/pmIvsbzTAVS9aWLJ0fdwgjxS7I= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 57792385742A for ; Tue, 17 May 2022 08:27:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 57792385742A Received: by mail-wm1-x336.google.com with SMTP id m2-20020a1ca302000000b003943bc63f98so839780wme.4 for ; Tue, 17 May 2022 01:27:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=ZLYluYFTs0Z6CNzLAxyPjW/qApKVQ7+5r8ygjpCB+Dc=; b=B72AlPxrXipsGV6SoQnTWR5B0HQ+Q8Jw0gJEkvmI3yGutW5+6Rp8c7kN6xTQtKYgHr qtrzjlJ+4zbA03QBdvB2SD/gnULWFw72tvLXTmqx9Upb+nObFsanPu6H5tjPAt600Ykj fYPXcTpodfe7638oWVymWuxzFejQSVXnWiOl/Ylyo1+MftqSBGhRH9lfi7cc5KWs9m1n CGFiePnjbZe1VTgV9XovuVUnBNMXmOOmG1zQ9MM262KeHm5P6v7Uxv1QbITaOveNSJja 1zMMvbb8759OIXfCpMhbiUX62BasgSxAQGoT+sml3BpQ0bEqHwPKkNOSje/CzKStm7fl QJ3g== X-Gm-Message-State: AOAM532j4qwNTZ/zQDCglPieJSQSCZ34FVYq3+JT+aSfDdF4NfWTByrm KaKmIYDamOnVawUE+ec9wG7zGpuZTKKRCF+k X-Google-Smtp-Source: ABdhPJx0DditKVs+ncAtXegJ/r0K3ZD2l4UQg9ZyVA9yBoo2tPzkitIjLvkmboXkwPI/PTN1Z5NL3g== X-Received: by 2002:a05:600c:1e89:b0:394:9587:cbe0 with SMTP id be9-20020a05600c1e8900b003949587cbe0mr30896508wmb.89.1652776068204; Tue, 17 May 2022 01:27:48 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id h24-20020a7bc938000000b003942a244ec4sm1316531wml.9.2022.05.17.01.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 01:27:47 -0700 (PDT) Date: Tue, 17 May 2022 08:27:47 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix small glitch in Expand_N_Full_Type_Declaration Message-ID: <20220517082747.GA1089938@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.2 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Eric Botcazou Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The original node is not guaranteed to also be an N_Full_Type_Declaration, so the code needs to look into the node itself. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * exp_ch3.adb (Expand_N_Full_Type_Declaration): Look into N. diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -6102,8 +6102,7 @@ package body Exp_Ch3 is Par_Id := Base_Type (Full_View (Par_Id)); end if; - if Nkind (Type_Definition (Original_Node (N))) = - N_Derived_Type_Definition + if Nkind (Type_Definition (N)) = N_Derived_Type_Definition and then not Is_Tagged_Type (Def_Id) and then Present (Freeze_Node (Par_Id)) and then Present (TSS_Elist (Freeze_Node (Par_Id)))