From patchwork Mon May 16 08:43:02 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: 54006 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2374E3858C74 for ; Mon, 16 May 2022 08:50:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2374E3858C74 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652691034; bh=S6JeXyW+f/F+TimlB48TA1sdQOWJwv7fOmllX8Sh5LM=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=YR16eyPNG7rSJI3jMLsM16qdvxCGm44/6Snjak91CN2KW1dVZyzc6WnA8mpdvRR9Y /dTAahaIGSP0L0x2KY8pD9b61no8VbaKtbIyWp8e6hkWjv5jNLnYca9kTsvH4ZNJ/p lFJtGCnB+TzHmkIwviV1W85J9gckzII/jGgSWm6s= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 9BB053857407 for ; Mon, 16 May 2022 08:43:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9BB053857407 Received: by mail-wr1-x433.google.com with SMTP id d21so3555050wra.10 for ; Mon, 16 May 2022 01:43:03 -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=S6JeXyW+f/F+TimlB48TA1sdQOWJwv7fOmllX8Sh5LM=; b=n1AQ+jGw74J/Lcx6+QoU+2SRxedG5SUvoZnSlfqVovPcOrPbnNqyvxK0SdEAayxXwV QfIyY3jReAPi38MYdEGL1T6Pmp+kOSw/6bsnbxHZpxfiT9fEvod7lGY0ak38SJTfYvLW 7IJ6nYqCldNC9LT3R2+BR0bjgmudJiDBG2rSm5wcj+wm0UrjeJ0Xdp7+AMuMcrcwYTTx AMco/y9mUF44TWPw3vUAmipJDlseKx54VqeVhWKi0WoJicRB9YL1MGFzehQqInMyt28M muH1HBpidaG23/BVNi0NRYQLcyVJeP21XBddxuK7iyAHz1YCXTsAOY5buyBng/BXEB2H t15Q== X-Gm-Message-State: AOAM5306ZH9kJcnaLlZE3QuQtqOD45VkGYI9bYvtXTVmrG+HlsnInSZD PlYhT8PBtF+NteAFbkkGuduceIrU2sCfhg== X-Google-Smtp-Source: ABdhPJyRxFRTl8n14M82P3p37BrZVBljO/2jHOpeyWMPCow2vU4Vq/7mu+bVquih2q/+3qdp8yAvRg== X-Received: by 2002:a5d:620f:0:b0:20c:c1ba:cf8e with SMTP id y15-20020a5d620f000000b0020cc1bacf8emr13096966wru.426.1652690583249; Mon, 16 May 2022 01:43:03 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id n4-20020a5d5984000000b0020c77f36b13sm9120744wri.100.2022.05.16.01.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 01:43:02 -0700 (PDT) Date: Mon, 16 May 2022 08:43:02 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Remove duplicated detection of user-defined equality Message-ID: <20220516084302.GA3843464@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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Cleanup related to handling of user-defined equality in GNATprove. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * exp_ch3.adb (User_Defined_Eq): Replace duplicated code with a call to Get_User_Defined_Eq. diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -4500,32 +4500,14 @@ package body Exp_Ch3 is --------------------- function User_Defined_Eq (T : Entity_Id) return Entity_Id is - Prim : Elmt_Id; - Op : Entity_Id; + Op : constant Entity_Id := TSS (T, TSS_Composite_Equality); begin - Op := TSS (T, TSS_Composite_Equality); - if Present (Op) then return Op; + else + return Get_User_Defined_Eq (T); end if; - - Prim := First_Elmt (Collect_Primitive_Operations (T)); - while Present (Prim) loop - Op := Node (Prim); - - if Chars (Op) = Name_Op_Eq - and then Etype (Op) = Standard_Boolean - and then Etype (First_Formal (Op)) = T - and then Etype (Next_Formal (First_Formal (Op))) = T - then - return Op; - end if; - - Next_Elmt (Prim); - end loop; - - return Empty; end User_Defined_Eq; -- Start of processing for Build_Untagged_Equality