From patchwork Mon Nov 7 08:41:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 16322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1922888wru; Mon, 7 Nov 2022 00:53:12 -0800 (PST) X-Google-Smtp-Source: AMsMyM5kQJL4haYArCGeCs3qFQXaLkUzTAfJ2uIZKq5gjBknsd+WGJg5+OjOtABqah+Vb3k7COkk X-Received: by 2002:a17:906:8a68:b0:7ad:b78d:b1a2 with SMTP id hy8-20020a1709068a6800b007adb78db1a2mr42362284ejc.424.1667811192796; Mon, 07 Nov 2022 00:53:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667811192; cv=none; d=google.com; s=arc-20160816; b=NAJgrSOkJkDYaHom8P8YoyjFAqPMIlvyP5jgd/EdTkMi72cYercwhL5B0+J+UYYNrX P5sZtPC5m2AC2eRfW5E7Zy7zDIiEu+CdVmATsqvh5xkyh18AnYRO20oLGB1sEFdNDByv L6KQyAn1h4l4TZ50PNFrZUSqWH1ajGPFM2UzZQY5a4E2eB70lzNu7GSngjdgBemr+6Yg aKyWswTz5o0Z71efdPDSfKRSsWAtvY57sKjUGSvVhyfKKI/WWQ5KkyH/yacqc27iH+/b Gdy4TGdXf6lSq46UHeHNSkGZB8zCunIVVAKKpr/FRbKx90n69PqCOdMdRKP1mwK9q4So inDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=Qde9uql4qStvna1Vx8q3FetiaHY3liD99PIvqDgZM/o=; b=fPEbbYemZIXJ7H4nuI5oS+A/hwfyOVTKMV6tcxsokiApTp3ap8kIhzSh8a1oHEuSeI LzvbhLPdC8v6CmOaBKnJg8EErIcVrHmiGTAOzRJDB7USUtfhA3v01/CGuQuwLArJUprf 687n5A2kTPjne+/EQyZMnslMAPwv/ImH+Vf/r6AItW+iVRpOcZN6Ez1R6awpZcTq1Oxo Ue1T0jMzUw8e6qXcwDthf20xLHvOGZir3nWzK12UMVj9xA+QjkPhJFNhnbCrCjvmEj/+ T5rQQ5aBe3UuZXt2e++suKwVUdsuwpWsDdIs/kZ0cF1KuSVFuqBYi+3VImSo6dtW+kEV voaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=fxhdLzJk; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id l9-20020a056402254900b00461ace746adsi10313056edb.453.2022.11.07.00.53.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 00:53:12 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=fxhdLzJk; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 04FBD3829BF8 for ; Mon, 7 Nov 2022 08:47:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 04FBD3829BF8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667810831; bh=Qde9uql4qStvna1Vx8q3FetiaHY3liD99PIvqDgZM/o=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=fxhdLzJk0Hyk6k4K6QXa+Qcuvs/rEe4UuAbg5AEcUmsvHPg01jzIPSpV5ko/V7nLp I/kmu3fFHFkIgG4JaIN5alMnP7d6PQt6IGV9HQrdEhVbf73r8BvYQ+XZPZ3Sa5i5Ss o4mx6BnbhVHX9jcWMx/gKHany5HrTKVwUnkt0pls= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id 33005385829F for ; Mon, 7 Nov 2022 08:41:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 33005385829F Received: by mail-wm1-x32c.google.com with SMTP id ja4-20020a05600c556400b003cf6e77f89cso7925964wmb.0 for ; Mon, 07 Nov 2022 00:41:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Qde9uql4qStvna1Vx8q3FetiaHY3liD99PIvqDgZM/o=; b=qOOngcBOoTr1J89DoSXLFgm1jm5JOzpcm/lSdM7zSAgC5P7ctqN4r6I8NHnD+hRbu2 gH3+6JgKcQTE3kmlJ4xWSUnpN9GqaT4QQPZRzPEewQ6KMOuOoRA+t338v/EsPsjU97Sc IxXrzbyyvXVETx3NTxZ1V5xMWw71cwY5oD0l1uoT9imSCavY8OCkl5fDJVoqEUK3GWSZ R8JmZfNJbv2iNXzRGiby+HIz20kzE6qZhEKsUNC3JanS000JAtBGlzH3TlYOnw5PTTtA X+0guNiZwZ1C1j/kT1v9+ZYVJ0tbpB5X6FnewL6jGJ28I8HKp61c/IZIh6+uMJSl8X/p H64w== X-Gm-Message-State: ANoB5plmTBJ2Wj3amGPhilv44YZIh0T+WeeA9wrQK4h872CiHRcmFSqr GYwCKmGTRAS3cW1GM8E+U7cIGVKlZE9JnA== X-Received: by 2002:a1c:f407:0:b0:3cf:a856:ba12 with SMTP id z7-20020a1cf407000000b003cfa856ba12mr3847657wma.18.1667810499017; Mon, 07 Nov 2022 00:41:39 -0800 (PST) Received: from poulhies-Precision-5550.lan (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id q10-20020adff94a000000b0022e035a4e93sm6548850wrr.87.2022.11.07.00.41.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 00:41:38 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Bob Duff Subject: [COMMITTED] ada: Use named notation in calls to Expand_Composite_Equality Date: Mon, 7 Nov 2022 09:41:35 +0100 Message-Id: <20221107084135.151888-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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.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: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748826789265584042?= X-GMAIL-MSGID: =?utf-8?q?1748826789265584042?= From: Bob Duff Use named notation in calls to Expand_Composite_Equality. gcc/ada/ * exp_ch4.adb (Component_Equality, Expand_Array_Equality) (Expand_Record_Equality): Use named notation. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/exp_ch4.adb | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index 4a60ff59601..0a104cd8e23 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -1725,7 +1725,8 @@ package body Exp_Ch4 is Expressions => Index_List2); Test := Expand_Composite_Equality - (Typ, Nod, Component_Type (Typ), L, R); + (Outer_Type => Typ, Nod => Nod, Comp_Type => Component_Type (Typ), + Lhs => L, Rhs => R); -- If some (sub)component is an unchecked_union, the whole operation -- will raise program error. @@ -2013,7 +2014,9 @@ package body Exp_Ch4 is Prefix => New_Copy_Tree (New_Rhs), Expressions => New_List (New_Copy_Tree (Low_B))); - TestL := Expand_Composite_Equality (Ltyp, Nod, Ctyp, L, R); + TestL := Expand_Composite_Equality + (Outer_Type => Ltyp, Nod => Nod, Comp_Type => Ctyp, + Lhs => L, Rhs => R); L := Make_Indexed_Component (Loc, @@ -2025,7 +2028,9 @@ package body Exp_Ch4 is Prefix => New_Rhs, Expressions => New_List (New_Copy_Tree (High_B))); - TestH := Expand_Composite_Equality (Ltyp, Nod, Ctyp, L, R); + TestH := Expand_Composite_Equality + (Outer_Type => Ltyp, Nod => Nod, Comp_Type => Ctyp, + Lhs => L, Rhs => R); return Make_And_Then (Loc, Left_Opnd => TestL, Right_Opnd => TestH); @@ -13380,15 +13385,16 @@ package body Exp_Ch4 is end if; Check := - Expand_Composite_Equality (Typ, Nod, Etype (C), - Lhs => - Make_Selected_Component (Loc, - Prefix => New_Lhs, - Selector_Name => New_Occurrence_Of (C, Loc)), - Rhs => - Make_Selected_Component (Loc, - Prefix => New_Rhs, - Selector_Name => New_Occurrence_Of (C, Loc))); + Expand_Composite_Equality + (Outer_Type => Typ, Nod => Nod, Comp_Type => Etype (C), + Lhs => + Make_Selected_Component (Loc, + Prefix => New_Lhs, + Selector_Name => New_Occurrence_Of (C, Loc)), + Rhs => + Make_Selected_Component (Loc, + Prefix => New_Rhs, + Selector_Name => New_Occurrence_Of (C, Loc))); -- If some (sub)component is an unchecked_union, the whole -- operation will raise program error.