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: 1785971 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=NvBxcK2d; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QRgmr1Snpz20Q0 for ; Thu, 25 May 2023 18:13:48 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 29AF93885504 for ; Thu, 25 May 2023 08:13:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29AF93885504 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685002426; 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=NvBxcK2dDVFYo6n80s3X6WDZygaNLSMcyerF9BOw+8tvrdhRFYr43nLEHBqTYokw5 rXNZOl9+ujdnOXMP4IicIVkR4s4qRelauxpMmMrw9wBKJlX9CrsFAEzFX2lI3DWYIm CYam0tlQmj1gfJ5fNUUAt4rlwfGW77PwTGlBi/QU= 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-Google-Smtp-Source: ACHHUZ6RVpi3LPoOwU1I3y0em82byIT0k03B8WEUSWxcLuXfVUzmPp+bzHNZFIfGxqFeGcn6Irphpw== 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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);