From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1285) id 08FB83865C2A; Wed, 27 Sep 2023 08:28:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08FB83865C2A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1695803281; bh=DhdkoOOtwyhqUXTT0MpzgD6D7UTTH+6uULZyHRvE7y4=; h=From:To:Subject:Date:From; b=BvcvqYFqcdE5THo1m76VPth2Uo7aV2WU/BnE2OxXt/LkgyyBUIR0aKRuhRnRUshTM h8EsVNDFsWNnheHe37fXpmdZG4AxomFCpOW+eLEXWUX/sFK75l5vcIMpWg8PIXytIe ur+g5yM638VTnuO+AEKI2xpCt14ttrBC3TTBEG3A= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Eric Botcazou To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-7900] ada: Fix memory explosion on aggregate of nested packed array type X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 0bbfe1295c4d2f0387d8411a52d7a7ca5cb038ed X-Git-Newrev: 0c28157ba7edb36329447008553be7d050e09a02 Message-Id: <20230927082801.08FB83865C2A@sourceware.org> Date: Wed, 27 Sep 2023 08:28:01 +0000 (GMT) List-Id: https://gcc.gnu.org/g:0c28157ba7edb36329447008553be7d050e09a02 commit r13-7900-g0c28157ba7edb36329447008553be7d050e09a02 Author: Eric Botcazou Date: Tue Jul 11 13:29:55 2023 +0200 ada: Fix memory explosion on aggregate of nested packed array type It occurs at compile time on an aggregate of a 2-dimensional packed array type whose component type is itself a packed array, because the compiler is trying to pack the intermediate aggregate and ends up rewriting a bunch of subcomponents. This optimization was originally devised for the case of a scalar component type so the change adds this restriction. gcc/ada/ * exp_aggr.adb (Is_Two_Dim_Packed_Array): Return true only if the component type of the array is scalar. Diff: --- gcc/ada/exp_aggr.adb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index b0bd8c0b29a..f78d339961e 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -328,7 +328,7 @@ package body Exp_Aggr is -- N is the N_Aggregate node to be expanded. function Is_Two_Dim_Packed_Array (Typ : Entity_Id) return Boolean; - -- For two-dimensional packed aggregates with constant bounds and constant + -- For 2D packed array aggregates with constant bounds and constant scalar -- components, it is preferable to pack the inner aggregates because the -- whole matrix can then be presented to the back-end as a one-dimensional -- list of literals. This is much more efficient than expanding into single @@ -9217,9 +9217,11 @@ package body Exp_Aggr is function Is_Two_Dim_Packed_Array (Typ : Entity_Id) return Boolean is C : constant Uint := Component_Size (Typ); + begin return Number_Dimensions (Typ) = 2 and then Is_Bit_Packed_Array (Typ) + and then Is_Scalar_Type (Component_Type (Typ)) and then C in Uint_1 | Uint_2 | Uint_4; -- False if No_Uint end Is_Two_Dim_Packed_Array;