From patchwork Thu May 12 12:40:14 2022 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: 1630183 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=qAHrHBSu; dkim-atps=neutral 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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.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 (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzX7t0tTHz9sGF for ; Thu, 12 May 2022 23:05:30 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DCBF73858C53 for ; Thu, 12 May 2022 13:05:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DCBF73858C53 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652360727; bh=nt4xUX5iJwn3AihrH3tQivqWte91sfDdxLIsYCdNthY=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=qAHrHBSu4LsJQe/RnR/Pke6xS/YmdFjRhm5fIaQ6Mz5CKBnX25MnWj0W0f/YbyD2y 8AsOOkURzc9m11vcAJlb2ej6sleMyiZADrs5+M2bo8pPhlBrh8soUWg6VbxEUaofPZ 79ol7HnJi2R+BWoV/IDC9N0JbKLPFO6Q4Baekvkc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id 442693846060 for ; Thu, 12 May 2022 12:40:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 442693846060 Received: by mail-wr1-x429.google.com with SMTP id b19so7051386wrh.11 for ; Thu, 12 May 2022 05:40:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=nt4xUX5iJwn3AihrH3tQivqWte91sfDdxLIsYCdNthY=; b=1qVsfR0PjRsqw/SrZHXQvJ7iQU6/e7hQFKxkwietx7uRP0B6nvVw2PKV1yKwkvrJAX oMlRSYSjWjzvomsyp4U2/8KvwywJf+AYEnNw4PBEj/phR9yKKNc4yQxJPRFyFXxmSgOF yuWrX/iVeVo/3tPLsDPcnrsCDdy8YdEEVC5WwQRJz044RftylFwCtzcewyXWd3ZfamK7 hROnvZf42+HjEd8nelXvgsSZampJwyLy8rA9WvKKpbgFl3DRIqwTSDVsGOB5xVf5prqy OacCPdp6lIRRt0386y7KdEiJUO7vqlWfmSlmDbvq1T4pBaJ4xKaspw8BtnSJc1Cldkzk H3uQ== X-Gm-Message-State: AOAM533Vx8OJKdyI9mAknpPHXKzAtpWy2+wojnqq+w2aTnIHlJ2yZt7x sfPZDW0R769kLullH1k3q4T09Gkj4gBy4g== X-Google-Smtp-Source: ABdhPJygM+HPbdJqGdKtjvIobNEq6afJxfJc2eP7vk5twLSxInq0iodYy54BMp0j039KQH5GDdbdqw== X-Received: by 2002:a5d:47c5:0:b0:20c:5a48:7162 with SMTP id o5-20020a5d47c5000000b0020c5a487162mr28817966wrc.32.1652359215839; Thu, 12 May 2022 05:40:15 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id n27-20020a05600c3b9b00b003942a244ee1sm2793957wms.38.2022.05.12.05.40.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 05:40:15 -0700 (PDT) Date: Thu, 12 May 2022 12:40:14 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Reuse collective subtype for comparison operators where possible Message-ID: <20220512124014.GA781186@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.2 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , X-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Piotr Trojanek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Replace membership alternatives with N_Op_Compare. Code cleanup; semantics is unaffected. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_res.adb (Resolve_Actuals): Simplify with N_Op_Compare. * sem_util.adb (Replace_Null_Operand, Null_To_Null_Address_Convert_OK): Likewise. diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -4163,12 +4163,7 @@ package body Sem_Res is -- marked with Any_Type. Since the operation has been resolved to -- the user-defined operator, that is irrelevant, so reset Etype. - if Nkind (Original_Node (N)) in N_Op_Eq - | N_Op_Ge - | N_Op_Gt - | N_Op_Le - | N_Op_Lt - | N_Op_Ne + if Nkind (Original_Node (N)) in N_Op_Compare and then not Is_Boolean_Type (Etype (N)) then Set_Etype (A, Etype (F)); diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -14189,9 +14189,7 @@ package body Sem_Util is begin pragma Assert (Relaxed_RM_Semantics); - pragma Assert - (Nkind (N) in - N_Null | N_Op_Eq | N_Op_Ge | N_Op_Gt | N_Op_Le | N_Op_Lt | N_Op_Ne); + pragma Assert (Nkind (N) in N_Null | N_Op_Compare); if Nkind (N) = N_Null then Rewrite (N, New_Occurrence_Of (RTE (RE_Null_Address), Sloc (N))); @@ -26079,9 +26077,7 @@ package body Sem_Util is if Nkind (N) = N_Null then return Present (Typ) and then Is_Descendant_Of_Address (Typ); - elsif Nkind (N) in - N_Op_Eq | N_Op_Ge | N_Op_Gt | N_Op_Le | N_Op_Lt | N_Op_Ne - then + elsif Nkind (N) in N_Op_Compare then declare L : constant Node_Id := Left_Opnd (N); R : constant Node_Id := Right_Opnd (N);