From patchwork Mon Nov 14 13:52:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 19822 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2157163wru; Mon, 14 Nov 2022 05:58:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf49XZKCBnmBJHppZeeOeKNkPbdCNaRLaO1BK2DDB3fMaVjDDW45rgf4k7SBjjHrOSxj/zjo X-Received: by 2002:a05:6402:f84:b0:461:c894:f6b5 with SMTP id eh4-20020a0564020f8400b00461c894f6b5mr11388817edb.52.1668434284871; Mon, 14 Nov 2022 05:58:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668434284; cv=none; d=google.com; s=arc-20160816; b=CScnAN/uNs3r9APZK4wrqBYf7Fcrj9GH58gh8tY3Fw8Sugd/1SPrhqXkRwAh5icGQw 1p+3+/YdNHqfipbnaFDjXJrW+giBPnV7nZX19RuAIrr5RonxKXXyRk2Se4Jww+4Cx6PH xROwN8lzrHUr6IDWr99aLkgOhuC5uXdDZzE/mTQM741BYbW4S4ryad3mZVDTt8AT62rS udC+sAVsEGqjt8IkBxiv1OJR4TcIIR16kTSBn2XPmA0L3LHDZNJ6czsdM32I4q69F3da btptI9RZT2oppZPnnlbr6U2AY6UElRAqhEcGI4byLg0U+Isu7pmfs/H1cBpr+sP9CbAG RitA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=bvogHHSHBRAa33HuMX6AV+O10TzOf0qEESOaFuwL7z8=; b=fzFouXxX3tQyqwn3QfsIQBFFBO/O975LXlNx1CuUIIJ94GOQ1Rl6QAergiUO4lbJk/ VFKKRIfYq9aKNzANKu751Qh8uPVBp/7zHzqQ9/1P475gLAfmxIank1Wu+EXKvuXMUlh3 kMMtVkuVbv421UMiFATU4lTYTyO1cD1H+H/r9R/ixEuG5OsXqk01e9hmwYDl8oOUsq5Q Xy2OmAfpAUJTFneARfNhP7/8Bol6AGxBly/IGcESODyKWTXoQ5NnjosEg9SZAh9X35qt Jt3pbWBtsgDJkKfPNO15SGDi4F1D/yieRIzCUVY/blx5huFUXY5UNAIVDk2abZHvPT4Y xe5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="K4PjW/bQ"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id ez18-20020a056402451200b0045d088f4b79si6370322edb.258.2022.11.14.05.58.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 05:58:04 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="K4PjW/bQ"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F22FB393BA5E for ; Mon, 14 Nov 2022 13:54:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F22FB393BA5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668434093; bh=bvogHHSHBRAa33HuMX6AV+O10TzOf0qEESOaFuwL7z8=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=K4PjW/bQPkHk08WVGCdnfVe8hqmlqsL0uqC+O2t/D6kLe6zmRw2831SUA7nCgMyZO 12jnVZRZgeCdacWS9VG5IyuGC4pdgS9fWE/WlEdH0jZ5X0A7xnc7yquAONplsHRq7C ozb+1Z+E7A7L+P4YBZ1ukr1ND24UoxZXohLCESUI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id 8C7433858035 for ; Mon, 14 Nov 2022 13:52:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8C7433858035 Received: by mail-wm1-x331.google.com with SMTP id 129-20020a1c0287000000b003cfe48519a6so1023631wmc.0 for ; Mon, 14 Nov 2022 05:52:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=bvogHHSHBRAa33HuMX6AV+O10TzOf0qEESOaFuwL7z8=; b=RUs79KEgt29/1LWqhB2+x05tx4bWOR6VjKQoBACJ5zgTo6MsO9PMiGgvxFrIlia/mm gyyAXrVqiI9X28ROUGjiXf0WZJVj6swZimryB+SU5x0bhUiaS5XHRdALFxkYbU1fjkZM tnGJo0yDSbqUBi3/CY8NXpO+7IDZMTOd7IGk0AoIyrRvEeOzi9wmpvIITAWiVh5Sp1ip OsH67HWAu1lrmB9burg5kIoSkcj7vHQzmm0T+eSe56SBg2Lue1VP8OPfO0ktZyTOAu9V zfwGDJfw8QS+rJ8Z9w86F91pYpW/6EPzQgvsiN7o3j3hA01vCJu2oX8vCcpV3r0Wpufs 4viw== X-Gm-Message-State: ANoB5pnLJtEjbZzmXipRmEiEPJ0akHaE63ocSyaxBxw7Eje/uX8HdItd gimDWO1TcoiKFISwMafTngeoI687WD2moQ== X-Received: by 2002:a05:600c:2258:b0:3cf:cf89:90f with SMTP id a24-20020a05600c225800b003cfcf89090fmr8194510wmm.186.1668433942294; Mon, 14 Nov 2022 05:52:22 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id k16-20020adff5d0000000b002383edcde09sm9594391wrp.59.2022.11.14.05.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 05:52:21 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Yannick Moy Subject: [COMMITTED] ada: Fix error on SPARK_Mode on library-level separate body Date: Mon, 14 Nov 2022 14:52:19 +0100 Message-Id: <20221114135219.52903-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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 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: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749480148458521936?= X-GMAIL-MSGID: =?utf-8?q?1749480148458521936?= From: Yannick Moy When applying explicitly SPARK_Mode on a separate library-level spec and body for which a contract needs to be checked, compilation with -gnata was failing on a spurious error related to SPARK_Mode placement. Now fixed. gcc/ada/ * sem_prag.adb (Analyze_Pragma): Add special case for the special local subprogram created for contracts. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_prag.adb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 615c6d2110c..77fcb1c505f 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -23424,10 +23424,14 @@ package body Sem_Prag is Spec_Id : constant Entity_Id := Unique_Defining_Entity (Decl); begin - -- Ignore pragma when applied to the special body created for - -- inlining, recognized by its internal name _Parent. + -- Ignore pragma when applied to the special body created + -- for inlining, recognized by its internal name _Parent; or + -- when applied to the special body created for contracts, + -- recognized by its internal name _Wrapped_Statements. - if Chars (Body_Id) = Name_uParent then + if Chars (Body_Id) in Name_uParent + | Name_uWrapped_Statements + then return; end if;