From patchwork Thu May 25 08:05:45 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: 98862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp200760vqr; Thu, 25 May 2023 01:21:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6A7k+HX43FHKsC/MYzBsLFPe9Do8GC43ntCIoD4IEXm1VQxv4wN1NN9H4FW8C37hCGlQY0 X-Received: by 2002:a05:6402:6c1:b0:50b:d34c:4710 with SMTP id n1-20020a05640206c100b0050bd34c4710mr3466621edy.5.1685002897109; Thu, 25 May 2023 01:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685002897; cv=none; d=google.com; s=arc-20160816; b=lSqIkCF5+3OY504l4wtztcbp5ZHkmyHt/wrja1bncNQLLRmgIpdO+IAxVPPVm/nF7G +jBzPr9+43OIJc8Rg5w+QBf01q+ytq9qHiOqCEIS7kYADSlsVJdsogSn/Mr3msYnbaLO 2nJRBGzTw0BcjevQck2qS7Q4ew/g45JUOFTjluaLwaT3alAASxh6+uYG9p8GXdbu75WV 6tMZZZGEqfaRo1Ur1pGB2LLOO9vOG0L4j1M8Oij0PM55Ih7+RpOVAW14rDqLbxHzpkek 9fiE8bC7WAlOI/FIOer89wF5zNCyvccYp1FXzoBb5gGt8WL3KIOhLl2nC3v9W0ghUCNH va3A== 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=KvuO5fcqqNrxeA+p/QpfiOHuCsa0jS6Fcpg2HSMd1zE=; b=WZ39wJcPmTvfh2B0bZSTJ/cY3CuyLCaO0PnxcoYh/ClnJtHiie+ozS+Wa8Gv+9K0hC Bwsraj75xYe2iuvtlHxgvLtLZgQkAbxVjW+ornMcr/woxj7ivjZjvk1vCyWB1yzrxR4d VZLZNTwgZG9WCfBMNBIkeVq5NETmmwZNJ0K/yhMGdsjaiANruxlz/EBlVCkOH7kX52nz CS1nfnJ0UokPvqg03pWBciD2skkn3MBdaeFWvtereAjlwJkC8hRGteZ0WGGc2C00VPN1 gjp7XZ0y7WVoAb7UmNO6MyWgZ7TXwA+iogb8tU60lZwttIeH3q6eIaMMpR5+XMOSv82z wKow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=EJ2xyZfs; 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 s18-20020aa7c552000000b005069969e508si612381edr.522.2023.05.25.01.21.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:21:37 -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=EJ2xyZfs; 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 075F9395B076 for ; Thu, 25 May 2023 08:14:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 075F9395B076 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685002454; bh=KvuO5fcqqNrxeA+p/QpfiOHuCsa0jS6Fcpg2HSMd1zE=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=EJ2xyZfsNMPzNXryDq20nSzTJcc3Qo76hJgdPVVN+olXhQI1vZB4s77CySwvDiQ5S 6RhUaHoao/ho5Uq2hDgxrYmqn3a0m9VJZIReonO2VGVWdY/fb5gEZCPgzV6iXL22i9 tQJIm0URotWKx56ojSE+SH9f0t5qsB8fdCwr7LyQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id 4DE413856DD0 for ; Thu, 25 May 2023 08:05:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4DE413856DD0 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-309553c5417so1758070f8f.2 for ; Thu, 25 May 2023 01:05:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685001947; x=1687593947; 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=KvuO5fcqqNrxeA+p/QpfiOHuCsa0jS6Fcpg2HSMd1zE=; b=Fno6TMeSHAa4SHd8dnwnLHhfKB9hcM1IdsFOFv/c80qUnJHIhHDChOz7PPpsUs3mBh BnWx0UayLqmKcZdNBO1f8Yewmcs/cxgbhif8BsHEttjGySbrKBALhDHqKqFB5tNJ8U/2 ln4YcbLj3CPmqwH3vR/79nkNFVYcgTHp89o8fCOMZclcKQf8L5g5svzUv6DKNDasq1xb sSQd48cin5ln6MMGZWZojx+ttTyoFzQNFX3X44vYkRsWyVkVbuxkKD/7xsjgIneiSstK /AE7YphvpR/w0eZOeaVmUBOcCUJQGF5gspvcrSOnsISGDTsOsuwqZJiwCY5kCvU+fhVS 93Cw== X-Gm-Message-State: AC+VfDwXBE0NPtUiwRJSNuH7s3HfvplJhsGof5lMdeQwfJEAEsO4XFSn s+VJZ1RjJwDijyZDh0eqY+G4g/W37Wb6KkX006GWWg== X-Received: by 2002:a5d:43c8:0:b0:309:3e48:f400 with SMTP id v8-20020a5d43c8000000b003093e48f400mr1739248wrr.18.1685001947125; Thu, 25 May 2023 01:05:47 -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 e7-20020adfef07000000b003079ed1f0a0sm894257wro.44.2023.05.25.01.05.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:05:46 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Remove redundant guards from calls to Move_Aspects Date: Thu, 25 May 2023 10:05:45 +0200 Message-Id: <20230525080545.1956348-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?1766853598018913741?= X-GMAIL-MSGID: =?utf-8?q?1766853598018913741?= From: Piotr Trojanek Routine Move_Aspects does nothing if its From parameter has no aspects. There is no need to check this at the call sites. Code cleanup related to changes in handling of expressions functions in GNATprove; semantics is unaffected. gcc/ada/ * par-ch7.adb (P_Package): Remove redundant guard from call to Move_Aspects. * par-ch9.adb (P_Task): Likewise. * sem_ch6.adb (Analyze_Expression_Function, Is_Inline_Pragma): Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/par-ch7.adb | 4 +--- gcc/ada/par-ch9.adb | 4 +--- gcc/ada/sem_ch6.adb | 8 ++------ 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/gcc/ada/par-ch7.adb b/gcc/ada/par-ch7.adb index e8a765bbac1..fc96ce89f6c 100644 --- a/gcc/ada/par-ch7.adb +++ b/gcc/ada/par-ch7.adb @@ -162,9 +162,7 @@ package body Ch7 is -- Move the aspect specifications to the body node - if Has_Aspects (Dummy_Node) then - Move_Aspects (From => Dummy_Node, To => Package_Node); - end if; + Move_Aspects (From => Dummy_Node, To => Package_Node); Parse_Decls_Begin_End (Package_Node); end if; diff --git a/gcc/ada/par-ch9.adb b/gcc/ada/par-ch9.adb index 752b28bd092..d6526de0b36 100644 --- a/gcc/ada/par-ch9.adb +++ b/gcc/ada/par-ch9.adb @@ -140,9 +140,7 @@ package body Ch9 is -- Move the aspect specifications to the body node - if Has_Aspects (Dummy_Node) then - Move_Aspects (From => Dummy_Node, To => Task_Node); - end if; + Move_Aspects (From => Dummy_Node, To => Task_Node); Parse_Decls_Begin_End (Task_Node); diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 48b363e077c..135d8ab7f0b 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -390,9 +390,7 @@ package body Sem_Ch6 is -- function to the proper body when the expression function acts -- as a completion. - if Has_Aspects (N) then - Move_Aspects (N, To => New_Body); - end if; + Move_Aspects (N, To => New_Body); Relocate_Pragmas_To_Body (New_Body); @@ -2875,9 +2873,7 @@ package body Sem_Ch6 is -- Move aspects to the new spec - if Has_Aspects (N) then - Move_Aspects (N, To => Decl); - end if; + Move_Aspects (N, To => Decl); Insert_Before (N, Decl); Analyze (Decl);