From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id ABAE4385843D; Mon, 7 Nov 2022 08:39:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ABAE4385843D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667810352; bh=Y4NIFgCrxN7Is3QRfBMDxJwICQqu6k6b2qSy8Tynjs8=; h=From:To:Subject:Date:From; b=R9tZzBfsgKGe05XOgsCKWyM0dZe7CNlY/hwbCt2zyqAszi3erjTt6yi58Fv2mcJHB sEF4sn3IxTTJXMvBEyMWh1R0Q3rfQ7sTbu4KxaLQ8Dd33U6DRZaOQG/bMBczQZsX0b p2obbeOfb+ljKFCArbCZxK+qAHLgMUkUlJKEAP7w= 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-3732] ada: Cleanup detection of code within generic instances X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: dcc02d3168b4457746f6ab1d8e73cf9d15c6d4e8 X-Git-Newrev: 72ae51d581dc8bcf8dcec9b5e0e1560d9e4099d1 Message-Id: <20221107083912.ABAE4385843D@sourceware.org> Date: Mon, 7 Nov 2022 08:39:12 +0000 (GMT) List-Id: https://gcc.gnu.org/g:72ae51d581dc8bcf8dcec9b5e0e1560d9e4099d1 commit r13-3732-g72ae51d581dc8bcf8dcec9b5e0e1560d9e4099d1 Author: Piotr Trojanek Date: Wed Sep 7 17:24:40 2022 +0200 ada: Cleanup detection of code within generic instances To check if a node is located in a generic instance we can either look at Instantiation_Location or at the Instantiation_Depth, but just looking at the location is simpler and more efficient. Cleanup related to improved detection of references to uninitialized objects; semantics is unaffected. gcc/ada/ * sem_ch13.adb (Add_Call): Just look at Instantiation_Depth. * sem_ch3.adb (Derive_Subprograms): Likewise. * sem_warn.adb (Check_References): Remove redundant filtering with Instantiation_Depth that follows filtering with Instantiation_Location. * sinput.adb (Instantiation_Depth): Reuse Instantiation_Location. Diff: --- gcc/ada/sem_ch13.adb | 2 +- gcc/ada/sem_ch3.adb | 6 +++--- gcc/ada/sem_warn.adb | 1 - gcc/ada/sinput.adb | 4 +--- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 2eb1a69e764..5507353136b 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -9930,7 +9930,7 @@ package body Sem_Ch13 is if Opt.List_Inherited_Aspects and then not Is_Generic_Actual_Type (Typ) - and then Instantiation_Depth (Sloc (Typ)) = 0 + and then Instantiation_Location (Sloc (Typ)) = No_Location and then not Is_Internal_Name (Chars (T)) and then not Is_Internal_Name (Chars (Typ)) then diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 90af32091e9..76dc6325060 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -16720,9 +16720,9 @@ package body Sem_Ch3 is (Is_Generic_Unit (Scope (Find_Dispatching_Type (Alias_Subp))) or else - Instantiation_Depth - (Sloc (Find_Dispatching_Type (Alias_Subp))) > 0); - + Instantiation_Location + (Sloc (Find_Dispatching_Type (Alias_Subp))) + /= No_Location); declare Iface_Prim_Loc : constant Source_Ptr := Original_Location (Sloc (Alias_Subp)); diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb index 1bfa8449ad7..a1a59a8857b 100644 --- a/gcc/ada/sem_warn.adb +++ b/gcc/ada/sem_warn.adb @@ -1720,7 +1720,6 @@ package body Sem_Warn is elsif Is_Generic_Subprogram (E1) and then not Is_Instantiated (E1) and then not Publicly_Referenceable (E1) - and then Instantiation_Depth (Sloc (E1)) = 0 and then Warn_On_Redundant_Constructs then if not Warnings_Off_E1 and then not Has_Junk_Name (E1) then diff --git a/gcc/ada/sinput.adb b/gcc/ada/sinput.adb index 8e80213e314..c96049b2678 100644 --- a/gcc/ada/sinput.adb +++ b/gcc/ada/sinput.adb @@ -620,7 +620,6 @@ package body Sinput is ------------------------- function Instantiation_Depth (S : Source_Ptr) return Nat is - Sind : Source_File_Index; Sval : Source_Ptr; Depth : Nat; @@ -629,8 +628,7 @@ package body Sinput is Depth := 0; loop - Sind := Get_Source_File_Index (Sval); - Sval := Instantiation (Sind); + Sval := Instantiation_Location (Sval); exit when Sval = No_Location; Depth := Depth + 1; end loop;