From patchwork Wed Jun 3 10:03:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1302912 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49cPf60q4Fz9sTH for ; Wed, 3 Jun 2020 20:04:46 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 327ED388C03F; Wed, 3 Jun 2020 10:03:19 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id 6C6BA388B02C for ; Wed, 3 Jun 2020 10:03:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6C6BA388B02C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=derodat@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id EA4F5117725; Wed, 3 Jun 2020 06:03:04 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id kb8tyncmX7W4; Wed, 3 Jun 2020 06:03:04 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id AFA2C117B42; Wed, 3 Jun 2020 06:03:04 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id AE91E156; Wed, 3 Jun 2020 06:03:04 -0400 (EDT) Date: Wed, 3 Jun 2020 06:03:04 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Spurious ineffective with clause warnings on use type clause Message-ID: <20200603100304.GA6642@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Cc: Justin Squirek Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This patch fixes an issue whereby the compiler generates spurious ineffective with_clause warnings under -gnatwr when the only use of the with'ed package occurs in a use_type clause in the context area of the body of the target package and such use_type clause has multiple prefixes. Tested on x86_64-pc-linux-gnu, committed on trunk 2020-06-03 Justin Squirek gcc/ada/ * sem_ch10.adb (Process_Body_Clauses): Add loop to interate through all prefixes in a use_type clause so that all packages in the expanded name get examined for effectiveness. --- gcc/ada/sem_ch10.adb +++ gcc/ada/sem_ch10.adb @@ -320,7 +320,6 @@ package body Sem_Ch10 is Nam_Ent : constant Entity_Id := Entity (Name (Clause)); Cont_Item : Node_Id; Prag_Unit : Node_Id; - Subt_Mark : Node_Id; Use_Item : Node_Id; function Same_Unit (N : Node_Id; P : Entity_Id) return Boolean; @@ -390,12 +389,24 @@ package body Sem_Ch10 is elsif Nkind (Cont_Item) = N_Use_Type_Clause and then not Used_Type_Or_Elab then - Subt_Mark := Subtype_Mark (Cont_Item); - if not Used_Type_Or_Elab - and then Same_Unit (Prefix (Subt_Mark), Nam_Ent) - then - Used_Type_Or_Elab := True; - end if; + declare + UE : Node_Id; + + begin + -- Loop through prefixes looking for a match + + UE := Prefix (Subtype_Mark (Cont_Item)); + loop + if not Used_Type_Or_Elab + and then Same_Unit (UE, Nam_Ent) + then + Used_Type_Or_Elab := True; + end if; + + exit when Nkind (UE) /= N_Expanded_Name; + UE := Prefix (UE); + end loop; + end; -- Pragma Elaborate or Elaborate_All