From patchwork Wed Oct 21 07:23:33 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: 1385393 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=2620:52:3:1:0:246e:9693:128c; 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 [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4CGMS30w2zz9sPB for ; Wed, 21 Oct 2020 18:24:03 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 41E1B3971C7D; Wed, 21 Oct 2020 07:23:40 +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 [205.232.38.15]) by sourceware.org (Postfix) with ESMTP id D63523971C48 for ; Wed, 21 Oct 2020 07:23:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D63523971C48 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 BB6CA1164F6; Wed, 21 Oct 2020 03:23:33 -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 bgGhVr8uNUHm; Wed, 21 Oct 2020 03:23:33 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id A9D5F1164E2; Wed, 21 Oct 2020 03:23:33 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id A6DBBF8; Wed, 21 Oct 2020 03:23:33 -0400 (EDT) Date: Wed, 21 Oct 2020 03:23:33 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Use helper function in Freeze_Subprogram_Body Message-ID: <20201021072333.GA73547@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, 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: Eric Botcazou Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This replaces the manual retrieval of the freeze node for the enclosing body of the generic with a mere call to Package_Freeze_Node. No functional changes. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_ch12.adb (Freeze_Subprogram_Body): Call Package_Freeze_Node to retrieve the freeze node for the enclosing body of the generic. diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -8980,8 +8980,8 @@ package body Sem_Ch12 is is Gen_Unit : constant Entity_Id := Get_Generic_Entity (Inst_Node); Par : constant Entity_Id := Scope (Gen_Unit); - E_G_Id : Entity_Id; Enc_G : Entity_Id; + Enc_G_F : Node_Id; Enc_I : Node_Id; F_Node : Node_Id; @@ -9128,14 +9128,6 @@ package body Sem_Ch12 is and then Enc_G /= Enc_I and then Earlier (Inst_Node, Gen_Body) then - if Nkind (Enc_G) = N_Package_Body then - E_G_Id := - Corresponding_Spec (Enc_G); - else pragma Assert (Nkind (Enc_G) = N_Package_Body_Stub); - E_G_Id := - Corresponding_Spec (Proper_Body (Unit (Library_Unit (Enc_G)))); - end if; - -- Freeze package that encloses instance, and place node after the -- package that encloses generic. If enclosing package is already -- frozen we have to assume it is at the proper place. This may be a @@ -9163,10 +9155,10 @@ package body Sem_Ch12 is -- Freeze enclosing subunit before instance - Ensure_Freeze_Node (E_G_Id); + Enc_G_F := Package_Freeze_Node (Enc_G); - if not Is_List_Member (Freeze_Node (E_G_Id)) then - Insert_After (Enc_G, Freeze_Node (E_G_Id)); + if not Is_List_Member (Enc_G_F) then + Insert_After (Enc_G, Enc_G_F); end if; Insert_Freeze_Node_For_Instance (Inst_Node, F_Node);