From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id B1AB13857711; Fri, 26 May 2023 07:35:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B1AB13857711 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685086537; bh=qOgibu4enLJeRabA6rPcu4ObFmytdHoofONkZKrb/TI=; h=From:To:Subject:Date:From; b=eR25mYX9tGYIE/YCm4VEA5PjQ0y6E91XVerzfgk+B68AlmoIhDPpU7Ns/qsqAWKl6 m6iH9tBA9Lr0Ruw3F/YfQSTEQ3F0iEX/oSm1IZAK/zbx2jZfcmy1dmvyu6bSCATKuD zYXn3CGcfFXQdmHUIifmR60wrkN/7dGXxquClzcQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marc Poulhi?s To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-1261] ada: Simplify expansion of positional aggregates X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: d874abd8b7f4574d5a3ad8a918abbf7608250dbf X-Git-Newrev: c8c37d2bfde00ec3ac8083502dbbe04f0b213298 Message-Id: <20230526073537.B1AB13857711@sourceware.org> Date: Fri, 26 May 2023 07:35:37 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c8c37d2bfde00ec3ac8083502dbbe04f0b213298 commit r14-1261-gc8c37d2bfde00ec3ac8083502dbbe04f0b213298 Author: Piotr Trojanek Date: Thu Mar 16 10:36:20 2023 +0100 ada: Simplify expansion of positional aggregates Code cleanup; semantics is unaffected. gcc/ada/ * exp_aggr.adb (Build_Constrained_Type): Use List_Length to count expressions in consecutive subaggregates. Diff: --- 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