From patchwork Fri May 26 07:35:51 2023 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: 70126 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 26B623857029 for ; Fri, 26 May 2023 07:39:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26B623857029 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685086759; bh=LvyMX/BuT61dGRjHD77qjQhlVRvFf1kpGElKfRQuOtQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=NFbiYGjgwf5t+JdnU1pG2txiL33BaMEWM6UqGRg8+VmUn2aJQWwFSkWvTyNEFHN7i 1+l3GeZZTwMxmpTM0iftLjB2IxYz4fg3zkzufIw4FNuMDMsJHWLafa2z9JHdM1xf4D kZ/QCrB+ofyezuRsMfX6EJoXUKeR5HgQjEMJaKyg= 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 0CBA33858291 for ; Fri, 26 May 2023 07:35:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0CBA33858291 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3063433fa66so205447f8f.3 for ; Fri, 26 May 2023 00:35:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685086553; x=1687678553; 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=LvyMX/BuT61dGRjHD77qjQhlVRvFf1kpGElKfRQuOtQ=; b=NxxCtx/Q8AP4ijZ8zecMXdowLW+Gw2W0/APEq4uyynxjMGR8epkr65m9XNnowtwpWU krI/PoGZxxSzmNdqleS2XX5OIi/3uO53s8CnkJ/oHrLy+F1ZB8YtO2rLTk9JC9ymZ0iA OBkD9K8bZ1zy6W4SBUi2dzVNnPY5j1mNvtynAlU4lrZOIzkxJuBz/WmICatJ/ROKrvKm S7WzMtLij4lwt5B8qNDXKHtbFzbX9phNZbtbVOIGaxD37PTm9OS2VAeg1IbtmZ7hzsU0 E08u+EsTNpimKMEQpaMwxUQnDoaDhy2KeXrDmcpYEZdDcxdLMNa8VYtXq9IxpLNgnr+2 LbGw== X-Gm-Message-State: AC+VfDxbSLXkfY9tbiPvmW+GYIS7EfQkMRlJ1ODQCI+Fv6oy4I0ukH9g UEJoqbkEZJPKqtnyNK/tNeKdq8+lQ/BhEuBFAV18bQ== X-Google-Smtp-Source: ACHHUZ7YrcCac0AVycFRWJeQrbc9RfftUVU6KcQiZcuef8G0aAy+4PR4x76qQrfGIMEVYY/HXymO7w== X-Received: by 2002:adf:ec0e:0:b0:30a:b1e3:57f with SMTP id x14-20020adfec0e000000b0030ab1e3057fmr585888wrn.35.1685086552899; Fri, 26 May 2023 00:35:52 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:777b:eef4:6f79:f26f]) by smtp.gmail.com with ESMTPSA id k15-20020a05600c0b4f00b003f611b2aedesm4261922wmr.38.2023.05.26.00.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 00:35:52 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Simplify expansion of positional aggregates Date: Fri, 26 May 2023 09:35:51 +0200 Message-Id: <20230526073551.2068036-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 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: =?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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Piotr Trojanek Code cleanup; semantics is unaffected. gcc/ada/ * exp_aggr.adb (Build_Constrained_Type): Use List_Length to count expressions in consecutive subaggregates. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/exp_aggr.adb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index bbc0f408abc..60449fbeb2d 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -5837,7 +5837,6 @@ package body Exp_Aggr is procedure Build_Constrained_Type (Positional : Boolean) is Loc : constant Source_Ptr := Sloc (N); Agg_Type : constant Entity_Id := Make_Temporary (Loc, 'A'); - Comp : Node_Id; Decl : Node_Id; Typ : constant Entity_Id := Etype (N); Indexes : constant List_Id := New_List; @@ -5853,19 +5852,14 @@ package body Exp_Aggr is Sub_Agg := N; for D in 1 .. Number_Dimensions (Typ) loop - Sub_Agg := First (Expressions (Sub_Agg)); - - Comp := Sub_Agg; - Num := 0; - while Present (Comp) loop - Num := Num + 1; - Next (Comp); - end loop; + Num := List_Length (Expressions (Sub_Agg)); Append_To (Indexes, Make_Range (Loc, Low_Bound => Make_Integer_Literal (Loc, 1), High_Bound => Make_Integer_Literal (Loc, Num))); + + Sub_Agg := First (Expressions (Sub_Agg)); end loop; else