From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id 1FF40385840A; Mon, 7 Nov 2022 08:38:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1FF40385840A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667810327; bh=cKu4SGoPhza2JHfZmIdq8mekCrl+T3LXMYFQrDJ3UvA=; h=From:To:Subject:Date:From; b=TqgxOoXf/uq6zfv+kV3wlPMn2jtBUvcAvxCjG4IlHt0JqjJpQnUwQktvIe+WNARRm /nQ0iUvhTMiidH/A/G4TCYhFhSM9iSlwxcUSxmp47Ft8qADY5lcBGFV4HBNtx/vwIH Om5fafaeo4h9dUU3o5SCOtsLpnbYPevX2xAd9FZw= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marc Poulhi?s To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3727] ada: Clean up code for visibility of generic actuals X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: 76b35e7227f34e2ce18e50ca637c86d7a1c3ef49 X-Git-Newrev: 4e92ad48dcfdb726f72f35039c5c102a99bf7759 Message-Id: <20221107083847.1FF40385840A@sourceware.org> Date: Mon, 7 Nov 2022 08:38:47 +0000 (GMT) List-Id: https://gcc.gnu.org/g:4e92ad48dcfdb726f72f35039c5c102a99bf7759 commit r13-3727-g4e92ad48dcfdb726f72f35039c5c102a99bf7759 Author: Piotr Trojanek Date: Fri Aug 12 11:55:35 2022 +0200 ada: Clean up code for visibility of generic actuals 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. Diff: --- 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;