From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 85EBB3836F92; Tue, 12 Jul 2022 12:27:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 85EBB3836F92 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1642] [Ada] Spurious use_type clause warning X-Act-Checkin: gcc X-Git-Author: Justin Squirek X-Git-Refname: refs/heads/master X-Git-Oldrev: 433cefcd0252ad8aae2aa8a69fbd9900809063b7 X-Git-Newrev: 729d2e2a80768b6df008ea98979dbe34b7e4ab9a Message-Id: <20220712122703.85EBB3836F92@sourceware.org> Date: Tue, 12 Jul 2022 12:27:03 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2022 12:27:03 -0000 https://gcc.gnu.org/g:729d2e2a80768b6df008ea98979dbe34b7e4ab9a commit r13-1642-g729d2e2a80768b6df008ea98979dbe34b7e4ab9a Author: Justin Squirek Date: Wed Jun 15 01:53:49 2022 +0000 [Ada] Spurious use_type clause warning This patch corrects an error in the compiler whereby a spurious redundant use_type_clause warning gets issued when the clause appears in the context_clause of a package preceding a with_clause for a package with an identical use_clause in its specification. gcc/ada/ * einfo.ads: Modify documentation for In_Use flag to include scope stack manipulation. * sem_ch8.adb (Use_One_Type): Add condition to return when attempting to detect redundant use_type_clauses in child units in certain cases. Diff: --- gcc/ada/einfo.ads | 4 ++++ gcc/ada/sem_ch8.adb | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index c5843f2903f..ed630191957 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -2309,6 +2309,10 @@ package Einfo is -- the corresponding entity. Reset at end of corresponding declarative -- part. The flag on a type is also used to determine the visibility of -- the primitive operators of the type. +-- +-- Note that manipulation of scopes on the scope stack will also cause +-- the flag to be set/unset since the setting of scopes affects +-- visibility. -- Is_Abstract_Subprogram -- Defined in all subprograms and entries. Set for abstract subprograms. diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index cda787063eb..eb9e359e497 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -10758,15 +10758,26 @@ package body Sem_Ch8 is return; end if; - -- There is a redundant use_type_clause in a child unit. - -- Determine which of the units is more deeply nested. If a + -- If there is a redundant use_type_clause in a child unit + -- determine which of the units is more deeply nested. If a -- unit is a package instance, retrieve the entity and its -- scope from the instance spec. Ent1 := Entity_Of_Unit (Unit1); Ent2 := Entity_Of_Unit (Unit2); - if Scope (Ent2) = Standard_Standard then + -- When the scope of both units' entities are + -- Standard_Standard then neither Unit1 or Unit2 are child + -- units - so return in that case. + + if Scope (Ent1) = Standard_Standard + and then Scope (Ent2) = Standard_Standard + then + return; + + -- Otherwise, determine if one of the units is not a child + + elsif Scope (Ent2) = Standard_Standard then Error_Msg_Sloc := Sloc (Clause2); Err_No := Clause1;