From patchwork Mon Nov 7 08:39:59 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: 16306 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1919997wru; Mon, 7 Nov 2022 00:45:14 -0800 (PST) X-Google-Smtp-Source: AMsMyM6DAZ35+EInOjiUNXKuXRK++PMXsuqMELL60n8buR0FpCAzr520KgW0O9s2AhWkPQD0ZHc3 X-Received: by 2002:a17:907:760e:b0:7ad:e4c9:dc79 with SMTP id jx14-20020a170907760e00b007ade4c9dc79mr33697519ejc.308.1667810714084; Mon, 07 Nov 2022 00:45:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667810714; cv=none; d=google.com; s=arc-20160816; b=JeNJwZFs8ZC6qsqBb2ylmduNVji+kGqU9RyVFh0Gm/qe1u4pYLAEyb5bd8kcWnHy2b rWs0ZSRGBQ0KQApLXTk5z9yTKxnuV3vTJ7EOkZC9LoWZ720F3W1ia10RFHuDKzkKTbSf 5MN84w7QyWo/fayseuUuzTKyLiTUzp2nBou4mA5jMgT61YWrj7pgJS5CpHW6NFU01QcA 0Df6CSepvc9ZKB5W7rkgTnKQkLc8qZUN84Bi0w5Xo39z/uQ/0Er8YrsPDM2zfCZRtVYH SSK4sSbLvgmiGKxxE6lkPSWnv0IepCAe1JIDLiV/Y0P6z6FcgaW39+GqjWIdkK0w9Yyj v2GA== 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=rzIsBAEUO5a3r/HSaXV9da/bHitH4EN3qeLi2ypOMjI=; b=Wk8kh50EVFYsXJIMsNXwRpIzPBNC7CRUJctCcoqUoJF0MCucrWolCqOVGF5cHXvFlq D9iF3ywklJqat085OuWcbo9PUoOlp9rAcqUw1IRls5XUcj31DL78HTWF5BE/zBla9jFP VRBiZhgQgGUojDeSNIlXI2jKVpSp5V3BIxhaKTNunx1o1YslnLBYvePwgCNW2UDg9vFE BbCo8qcotTSgsPdUTIa5lt73qOoYi978KNanMHXr0T36DLaiXv4jhtdTvPG3Ev61WUpI hjTT+JLZo5tnwtDbyoo/uLBLWiYetXQ8XO0beD7XlajshQRBu5hxobyITrrk5+9zc1v3 VwVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=iBo6T1Pj; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id f19-20020a05640214d300b004634dd8b6edsi8007551edx.296.2022.11.07.00.45.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 00:45:14 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=iBo6T1Pj; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 EF712385114A for ; Mon, 7 Nov 2022 08:42:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EF712385114A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667810550; bh=rzIsBAEUO5a3r/HSaXV9da/bHitH4EN3qeLi2ypOMjI=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=iBo6T1PjeK5WTENv/Bf1toH+3ZrBVxVur8VoUR+WT3c0Kxjidph9oJK4fRbx/fUEZ n5Pox9KHFy7vI6tpCoPp2ZIg0/SBDgAVJY8B/KKNMZLOLpteaQG21/wSTvF7fDFwV0 yHhOxfzJ0LV0gREIK2lj8jE7vWV2taiwzdUxZTa0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id 1B6873857BA2 for ; Mon, 7 Nov 2022 08:40:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1B6873857BA2 Received: by mail-wr1-x430.google.com with SMTP id bk15so14991630wrb.13 for ; Mon, 07 Nov 2022 00:40:04 -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=rzIsBAEUO5a3r/HSaXV9da/bHitH4EN3qeLi2ypOMjI=; b=dAjXmfqhddifTaagSEcf9kqBHKiz5z08HufRM9SXTsn85zgXkt873GWekflUqVGxgM zmTLixteRuxaTzyl8rUpe67W/Y1ae0yHrAL1MUVfAfjdBdBy6ayGpVJSpFtC0FMoEZVr 6hbF0mYfkQaxEFK/SO/lQOqMw22qcHn3LXA20UcnDG13YY3MRmen7tDkBTFx7Gi3qE/r a2oCTwVrx2GKRiQAG5iRV8aNse5eC5AeheRv9RpdSO5OeeNVniob4tuMpSNmh9szFVGN k1xg7EGoY7G9/yzvxQEocfmcch5x4lOEiLeuov8OqwOwunONgQXBQZvNDSaOQglefLBP C0DQ== X-Gm-Message-State: ACrzQf2SW4RyXLAEor5k9Ikw+NYWWw9zCD+X3VowL2FS1AVi6YmG0JWQ cmaUSH/D8Sy1xzKcaEXk4UtsqTlZQwX5Tg== X-Received: by 2002:adf:f482:0:b0:236:7a2f:69f with SMTP id l2-20020adff482000000b002367a2f069fmr31291014wro.115.1667810402955; Mon, 07 Nov 2022 00:40:02 -0800 (PST) Received: from poulhies-Precision-5550.lan (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id b18-20020a056000055200b00236545edc91sm6540858wrf.76.2022.11.07.00.40.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 00:40:02 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Clean up code for visibility of generic actuals Date: Mon, 7 Nov 2022 09:39:59 +0100 Message-Id: <20221107083959.150855-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?1748826287027402856?= X-GMAIL-MSGID: =?utf-8?q?1748826287027402856?= From: Piotr Trojanek Code cleanup related to fixing visibility of actual parameters in inlining-for-proof in GNATprove mode; semantics is unaffected. gcc/ada/ * sem_ch12.adb (Check_Generic_Actuals): Remove redundant parens; refactor an excessive if-statement; remove repeated call to Node. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch12.adb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 0b7b7c904d3..2b7833dfdcd 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -7023,7 +7023,7 @@ package body Sem_Ch12 is Astype := First_Subtype (E); end if; - Set_Size_Info (E, (Astype)); + Set_Size_Info (E, Astype); Copy_RM_Size (To => E, From => Astype); Set_First_Rep_Item (E, First_Rep_Item (Astype)); @@ -7054,12 +7054,10 @@ package body Sem_Ch12 is elsif Present (Associated_Formal_Package (E)) and then not Is_Generic_Formal (E) then - if Box_Present (Parent (Associated_Formal_Package (E))) then - Check_Generic_Actuals (Renamed_Entity (E), True); - - else - Check_Generic_Actuals (Renamed_Entity (E), False); - end if; + Check_Generic_Actuals + (Renamed_Entity (E), + Is_Formal_Box => + Box_Present (Parent (Associated_Formal_Package (E)))); Set_Is_Hidden (E, False); end if; @@ -15457,7 +15455,7 @@ package body Sem_Ch12 is end loop; end if; - Exchange_Declarations (Node (M)); + Exchange_Declarations (Typ); Next_Elmt (M); end loop;