From patchwork Tue Jul 7 09:27:36 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: 1324233 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 4B1HFN6Q9Kz9sSn for ; Tue, 7 Jul 2020 19:29:12 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F1AED38618E8; Tue, 7 Jul 2020 09:27:49 +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 AEF2F3861016 for ; Tue, 7 Jul 2020 09:27:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AEF2F3861016 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 1F36056107; Tue, 7 Jul 2020 05:27:37 -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 Zo07IaBCNqKL; Tue, 7 Jul 2020 05:27:37 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id D1B4856104; Tue, 7 Jul 2020 05:27:36 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id D0E7B156; Tue, 7 Jul 2020 05:27:36 -0400 (EDT) Date: Tue, 7 Jul 2020 05:27:36 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Use Is_Generic_Subprogram where possible Message-ID: <20200707092736.GA41687@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, 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: Piotr Trojanek Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Replace low-level Ekind_In tests with high-level Is_Generic_Subprogram. Cleanup only; semantics is unaffected. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * einfo.adb, sem_ch10.adb, sem_ch12.adb, sem_ch8.adb: Use Is_Generic_Subprogram. diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb --- a/gcc/ada/einfo.adb +++ b/gcc/ada/einfo.adb @@ -2577,9 +2577,7 @@ package body Einfo is function Is_Primitive (Id : E) return B is begin - pragma Assert - (Is_Overloadable (Id) - or else Ekind_In (Id, E_Generic_Function, E_Generic_Procedure)); + pragma Assert (Is_Overloadable (Id) or else Is_Generic_Subprogram (Id)); return Flag218 (Id); end Is_Primitive; @@ -5822,9 +5820,7 @@ package body Einfo is procedure Set_Is_Primitive (Id : E; V : B := True) is begin - pragma Assert - (Is_Overloadable (Id) - or else Ekind_In (Id, E_Generic_Function, E_Generic_Procedure)); + pragma Assert (Is_Overloadable (Id) or else Is_Generic_Subprogram (Id)); Set_Flag218 (Id, V); end Set_Is_Primitive; diff --git a/gcc/ada/sem_ch10.adb b/gcc/ada/sem_ch10.adb --- a/gcc/ada/sem_ch10.adb +++ b/gcc/ada/sem_ch10.adb @@ -6313,7 +6313,7 @@ package body Sem_Ch10 is if Is_Subprogram (E) and then Has_Pragma_Inline (E) then return True; - elsif Ekind_In (E, E_Generic_Function, E_Generic_Procedure) then + elsif Is_Generic_Subprogram (E) then -- A generic subprogram always requires the presence of its -- body because an instantiation needs both templates. The only 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 @@ -5664,8 +5664,7 @@ package body Sem_Ch12 is -- If renaming, get original unit if Present (Renamed_Object (Gen_Unit)) - and then Ekind_In (Renamed_Object (Gen_Unit), E_Generic_Procedure, - E_Generic_Function) + and then Is_Generic_Subprogram (Renamed_Object (Gen_Unit)) then Gen_Unit := Renamed_Object (Gen_Unit); Set_Is_Instantiated (Gen_Unit); diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -729,7 +729,7 @@ package body Sem_Ch8 is -- For subprograms, propagate the Intrinsic flag, to allow, e.g. -- renamings and subsequent instantiations of Unchecked_Conversion. - if Ekind_In (Old_P, E_Generic_Function, E_Generic_Procedure) then + if Is_Generic_Subprogram (Old_P) then Set_Is_Intrinsic_Subprogram (New_P, Is_Intrinsic_Subprogram (Old_P)); end if;