From patchwork Thu May 25 08:05:42 2023 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: 98865 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp201642vqr; Thu, 25 May 2023 01:23:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5aSX+pc1KSaIMOWRAInlJRl7LOljnUTPXwk1G2bBD0BzGZgp6gKoYSP/voq1yF4lzP0oIh X-Received: by 2002:aa7:d596:0:b0:50b:5211:446f with SMTP id r22-20020aa7d596000000b0050b5211446fmr3682983edq.6.1685003006328; Thu, 25 May 2023 01:23:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685003006; cv=none; d=google.com; s=arc-20160816; b=Wl2eWlfMCRYFYv5V4k8J6+Fyt/WKmQB84qzwKUl6EPjY+l24d8Ew60EWpHE5sxBbAa 2Qf0nj9y7hMqoOLWI1B5ez9vhx7f5jY97gp+kCc412jj2LdrxkkcswyDy3tZ4CTQNmsv X9zkQ2qy/W7LwSf84hhxtAhQPt5gvBmNTKFVNjbPD634eaFiehV6tIDPfah2Zr3BRTc0 Gz8zPi5rZvJPvRVZvG85f2+FUTpihYS5C/W7zqIkblXaDT2ssUseaO3+oezEDkS6g4Ex GGlCvVOe96+Mz1WWpg5xdcDiXch60h18HGJ0Cv9YVIL6e85RQ0KjHrk7Zf0ylaDFdXlT xfLQ== 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=ZvQr9hfoSoUCxW/cQW4gVdPtXXHoMASRQZA4IPu6XDw=; b=VlptwCq+rGjnVYli4WkAWM/NGMJFf8W/iqdNvCI84JRpvVGdH6vfMT1qTwhotaCIoR YXm7af58aP2sWSeNZiMgGTrDVrw8/oaDdd4o5irxW+xZlXK1qmjiwUPz9F317c1QPT1K 0BIVC5WYAlZs923wXwaCB0TlDcqcWSsMAKBPhNdJo2ag02uDUAgWiUOWYDqE7bx1XN4r L6qw1GHjSxcERq5GmVFMd9wuEruVFaKDayU2FNQLv5/Kf3sPHOv7YPlXzlZDO+3a/6lD 8Yml8UX/yVAPo6oNa6vWP0wr9Bch0upgt74bJaZKsOU554bKP/684Ta0LJOmhxws5aAb 7CxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=gnC6uRv2; 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 (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id m7-20020aa7c487000000b0050bfc1ca190si52855edq.673.2023.05.25.01.23.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:23:26 -0700 (PDT) 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=gnC6uRv2; 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 B4DD3396D809 for ; Thu, 25 May 2023 08:15:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B4DD3396D809 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685002515; bh=ZvQr9hfoSoUCxW/cQW4gVdPtXXHoMASRQZA4IPu6XDw=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=gnC6uRv2JTJVvSnEt1T/X9jpZlVHxUnTVUnp6DYs5YQVJuGoh+ehnoGyxKnSrjE8a JTvqWma0KPQD/cdrlvKDLHeHkxFU4xYli9L7ow2WdS+ccakIwphGkW6WJSBfgyoq7w vfTqLYNhIWYFyQ+rVcqhmaqh2mSKw9ke6HfiA4SQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id A6ED53857728 for ; Thu, 25 May 2023 08:05:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A6ED53857728 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f6094cb2d2so2919615e9.2 for ; Thu, 25 May 2023 01:05:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685001943; x=1687593943; 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=ZvQr9hfoSoUCxW/cQW4gVdPtXXHoMASRQZA4IPu6XDw=; b=LYwLxZ6nMR44oVIocZMe2oa+SPI1YNcmrIGyXhpmgBN8OFzgVTVTOtC5wUjHgW3E10 axsXOqXgkkK3i3kv/BsSkVmETMJ76ikR4UA2JdDVOoX86BM/Ysbf8gaNsdLotrreIPom ZEx/04FEqFBJfFQAFPM3ComVU6/KZEuKsQvRT1r3jfXYC65eWyFtyhqsAAiRaXCOCYFf fHBeb4gq8QXGmHA+WwGy1NF02gnX4wU8VcF5oqiVDoVR2pnX1FNEGeVFM6jYpAUs2EtQ xGY/VVvsqnpPJxgMBjZfnKmaNg24R57sidnIeF474iDiO/F+e6f4ikxoVoc6pgUpqKK6 ASmg== X-Gm-Message-State: AC+VfDzRbxkfK7yYYZpDxDb+vLEdjX1peJr30lelUKheuYnU8PXtsGhf eJx5FytM2171oIPE/n2OvXaYXnlngxEcvHHeGsEmtg== X-Received: by 2002:a05:600c:2904:b0:3f6:1526:de7 with SMTP id i4-20020a05600c290400b003f615260de7mr1674771wmd.10.1685001943415; Thu, 25 May 2023 01:05:43 -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 n4-20020a05600c294400b003f3157988f8sm1203829wmd.26.2023.05.25.01.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:05:42 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Fix copy-paste mistake in analysis of Exceptional_Cases Date: Thu, 25 May 2023 10:05:42 +0200 Message-Id: <20230525080542.1956225-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 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: =?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?1766853711975211704?= X-GMAIL-MSGID: =?utf-8?q?1766853711975211704?= From: Piotr Trojanek Trivial mistakes in copied code. gcc/ada/ * sem_prag.adb (Analyze_Pragma): Fix references to Exceptional_Cases in code copied from handling of Subprogram_Variant. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_prag.adb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 963c6dea238..40636f21fc7 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -16688,7 +16688,7 @@ package body Sem_Prag is Ensure_Aggregate_Form (Get_Argument (N, Spec_Id)); -- Chain the pragma on the contract for further processing by - -- Analyze_Subprogram_Variant_In_Decl_Part. + -- Analyze_Exceptional_Cases_In_Decl_Part. Add_Contract_Item (N, Defining_Entity (Subp_Decl)); @@ -16698,13 +16698,13 @@ package body Sem_Prag is if Nkind (Subp_Decl) in N_Subprogram_Body | N_Subprogram_Body_Stub then - -- The legality checks of pragma Subprogram_Variant are + -- The legality checks of pragma Exceptional_Cases are -- affected by the SPARK mode in effect and the volatility -- of the context. Analyze all pragmas in a specific order. Analyze_If_Present (Pragma_SPARK_Mode); Analyze_If_Present (Pragma_Volatile_Function); - Analyze_Subprogram_Variant_In_Decl_Part (N); + Analyze_Exceptional_Cases_In_Decl_Part (N); end if; end Exceptional_Cases;