From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id 586BA385803E for ; Mon, 7 Nov 2022 08:40:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 586BA385803E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wm1-x32d.google.com with SMTP id t25-20020a1c7719000000b003cfa34ea516so1720064wmi.1 for ; Mon, 07 Nov 2022 00:40:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dSbArB/7/DY+SJqkI+j7KMrU4UHE2XeujWyVssbqOv0=; b=JjEnhuNiXnKsEo89fn/xdFb94+YI5QDqQidTgyWSW6OukOwlQvq83yUyag0lWsqBOl Fw+bLJuMWX2sGNBFJWyFDh1/i797WaYpMbdjWTRV+qiKWY8tVL4XOIN8tct3A4QtTdbr 2Gx8PM65PqIn3MviTw/d43R5vywQfYStBzk7VHU8Nzz/L1fAmzt2EZMOuTKSg6Gybw9V UQ7Y6a706MvMSg1u/H1KOPYEn/y2/3UTcMF2iDNtUGJ7WxKLdndSiHDqgeAaYTzuTGoa 4qdRgipy4Lh3yHrVUDNkAWp+h5uO63tpUmwtiLxevF5hm1IJbTzB8dVWLLVJwAH/nckO OaRA== 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=dSbArB/7/DY+SJqkI+j7KMrU4UHE2XeujWyVssbqOv0=; b=xuxMqxXhCfmWTGTamqnPTrTYbQiFUqXSZ3ZbkEr7px5FyX6TR72psOdKm8eUIxJqT/ T+qkh3ChyQJtquteQKrYlHWXZFq4Qx4G2moU6EEG5RKTjBjRk+OCIiieDjGqUKFVW9xp VghVnBXTE3JPCEOphtfBCMMgMakNMrS3AE44/YF9w8cFBRoJVRH6VFRoSvgQNQmbD5lN N9LZej93xP0hmlNoMRhsnvtspuiyX4oK6rp6GbjlouUWIQTOctZtcATpYxqhLkvhUC+2 YwAlGfXy0bqJoKd6Z3W5F6M75e/Ifh+queMMpisclSEuJxoBhxX1spc4jhSQdAxYwvKu oeOQ== X-Gm-Message-State: ACrzQf2AAPVdq8gqpblGwN9f9pBxlepmXmbAdlz/t9mRNgfxRd7nW5qr upxtr3bk2ni3suVTT7ztWADgX//wZbW3Gw== X-Google-Smtp-Source: AMsMyM5G95mKSzbGwXQdapajccyU306JbmJSh9tjhUnnTSiblfyVaIgJo4ZgcGVRxg6uV582Rzszkg== X-Received: by 2002:a05:600c:746:b0:3cf:705c:d8d9 with SMTP id j6-20020a05600c074600b003cf705cd8d9mr28318618wmn.42.1667810429220; Mon, 07 Nov 2022 00:40:29 -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 g17-20020a5d46d1000000b0022efc4322a9sm6630036wrs.10.2022.11.07.00.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 00:40:28 -0800 (PST) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Cleanup detection of code within generic instances Date: Mon, 7 Nov 2022 09:40:26 +0100 Message-Id: <20221107084026.151175-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 List-Id: From: Piotr Trojanek 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. Tested on x86_64-pc-linux-gnu, committed on master. --- 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; -- 2.34.1