From patchwork Tue Nov 9 09:45:56 2021 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: 47252 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 5CD6A3858437 for ; Tue, 9 Nov 2021 09:56:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5CD6A3858437 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1636451808; bh=UuCFBVGhdA88xC4NIcDjSMMZQEr4gpoqf+VZicAy1EU=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=HnJeQtLZiN7faoh73ptMmLbQOCw621mNSk/zlAXmEvV54E3FYFz2WYShbz+EPakGF V/kLiNROzkk404iboHojw3//4N9QuRAVtCAkF/BA1jsOZ039i0cvqM9K2rdj+4t46a szxSYhIQ+Iu8db+Y+Rl+NyEkp1NCn4mBGokeQ2Tc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by sourceware.org (Postfix) with ESMTPS id DFCE33858423 for ; Tue, 9 Nov 2021 09:45:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DFCE33858423 Received: by mail-lf1-x136.google.com with SMTP id o18so42989534lfu.13 for ; Tue, 09 Nov 2021 01:45:59 -0800 (PST) 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=UuCFBVGhdA88xC4NIcDjSMMZQEr4gpoqf+VZicAy1EU=; b=WKNXKXcmMBHg/lR7d8uzk6EpqUwBclrZgJBNKfkhB6uATI6Tsb4LOCXTOb5GE9xCKV N1S4VuYJpgs4824eIfbgN0LzrM3KEgvsxV7XT/ACpTnTVMPAKzb5Jjuz+z0OclilOGW6 dQWUY5LgvlcM3+R1HD3yt73hPVLAFh0XLG590cSeLTQ3sVGoEEzh0ZW4UXl0dV/2ypDM J2xChyfSoJlNMiDoMAnPx2AqFR7rMc/T8qa4+H7a1tU4wCimNCFXtbnJyjUyJu5GJcvk 7xzsdySHLvaiIyPtg4BmqEOe2kdpqEddmcPiwqD3aQuIW98PWW34gzm74JWSjSgUlZlH Z/MA== X-Gm-Message-State: AOAM530amulbc1PXto7jiYboeHJZ2rzIHCZEyWO2fRWseQNvaXklaoul vkQTtm7fVBckAEpn5tMoKRHfzJaUT8WETccj X-Google-Smtp-Source: ABdhPJyjtzyUYbj8LPpAAAPAyCcupea+2qni5sldFaRKTt/AmjX0bZDuUNMqvOpWH6DEkKRHAKo8vQ== X-Received: by 2002:a05:6512:130c:: with SMTP id x12mr5888984lfu.101.1636451158763; Tue, 09 Nov 2021 01:45:58 -0800 (PST) Received: from adacore.com ([2a02:2ab8:224:2ce:72b5:e8ff:feef:ee60]) by smtp.gmail.com with ESMTPSA id o19sm415656lfk.280.2021.11.09.01.45.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 01:45:58 -0800 (PST) Date: Tue, 9 Nov 2021 09:45:56 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Simplify expansion of array equality Message-ID: <20211109094556.GA830203@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.0 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 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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 expansion of dispatching equality for GNATprove. Semantics is unaffected Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * exp_ch4.adb (Test_Empty_Arrays): Simplify with Evolve_Or_Else; remove unnecessary call to Relocate_Node. (Test_Lengths_Correspond): Likewise. diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -1902,41 +1902,20 @@ package body Exp_Ch4 is ----------------------- function Test_Empty_Arrays return Node_Id is - Alist : Node_Id; - Blist : Node_Id; - - Atest : Node_Id; - Btest : Node_Id; + Alist : Node_Id := Empty; + Blist : Node_Id := Empty; begin - Alist := Empty; - Blist := Empty; for J in 1 .. Number_Dimensions (Ltyp) loop - Atest := + Evolve_Or_Else (Alist, Make_Op_Eq (Loc, Left_Opnd => Arr_Attr (A, Name_Length, J), - Right_Opnd => Make_Integer_Literal (Loc, 0)); + Right_Opnd => Make_Integer_Literal (Loc, Uint_0))); - Btest := + Evolve_Or_Else (Blist, Make_Op_Eq (Loc, Left_Opnd => Arr_Attr (B, Name_Length, J), - Right_Opnd => Make_Integer_Literal (Loc, 0)); - - if No (Alist) then - Alist := Atest; - Blist := Btest; - - else - Alist := - Make_Or_Else (Loc, - Left_Opnd => Relocate_Node (Alist), - Right_Opnd => Atest); - - Blist := - Make_Or_Else (Loc, - Left_Opnd => Relocate_Node (Blist), - Right_Opnd => Btest); - end if; + Right_Opnd => Make_Integer_Literal (Loc, Uint_0))); end loop; return @@ -1950,25 +1929,14 @@ package body Exp_Ch4 is ----------------------------- function Test_Lengths_Correspond return Node_Id is - Result : Node_Id; - Rtest : Node_Id; + Result : Node_Id := Empty; begin - Result := Empty; for J in 1 .. Number_Dimensions (Ltyp) loop - Rtest := + Evolve_Or_Else (Result, Make_Op_Ne (Loc, Left_Opnd => Arr_Attr (A, Name_Length, J), - Right_Opnd => Arr_Attr (B, Name_Length, J)); - - if No (Result) then - Result := Rtest; - else - Result := - Make_Or_Else (Loc, - Left_Opnd => Relocate_Node (Result), - Right_Opnd => Rtest); - end if; + Right_Opnd => Arr_Attr (B, Name_Length, J))); end loop; return Result;