From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id DFE7E385AC30 for ; Mon, 5 Sep 2022 07:26:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DFE7E385AC30 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x430.google.com with SMTP id e13so10101487wrm.1 for ; Mon, 05 Sep 2022 00:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date; bh=dt/pc8vKor8QI92/SBLEypTEROnsGMWXnM6a9NovVvw=; b=ZcfAcgAoupfXTG/YmuMxsgQn4nxyPecM1zjKewkPL//PkaoiqDrNlVApSly0MAzrW/ 7/cuQ3MK+RinrqvwA6kQk/yvIpV4e0c41sjUtpUXVAJzKrKd0mWeXD2H4uc2QQz2uYhq s6/Xua9nuDw7OmLqMF+er3K1WKhMhYGN0jHEEh+b2kA9daDKiVuZQxu1Hjr6FUqZsSLV KPR1ZfWFIhszPOLTffzIaaDP9dQ2nJIGambtsReOJwBGYM9gsrqOJKfA+jWe212ZkEfT B8X1FCeCzwQ6V1fZopN0br2+D95UomWRtBr+adlIqYp8cyajMooZT5OHrRHO1ogM0btG lscg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date; bh=dt/pc8vKor8QI92/SBLEypTEROnsGMWXnM6a9NovVvw=; b=T/o7RVN/K0TPWJLQj5dqVkwsbkoGoug0A+E+RBLYNiU0EG/SJbIQ8sbiyK8aVgxcxi Ly3Mq6Y+OeFO6etOW65UDkM3RgbTjbm5OuFKOkv4q5MWeI56eGzGBsZvS802i2aywtLi 1Jf6l+Xo5kip70lWqRUZ8CEKjqQUkQfeRomcj5WqH7LB9+zuQeQ0TwtMYgIloikgnvkk c7ZvCjjWkk8wJ1LQbDvNVDeZYUu4yEojoerbTE7GlxLCL6SlZm13a6ngCTAXZvDB9wjp +JvIjaHZJZnyN6JNd7CPtfBW0G85DYsZhVCUKVTSLaKcnWo8XSjgl9+EtWYdTpZ+DdfJ +bcQ== X-Gm-Message-State: ACgBeo0d5x2T6UWFYy2K45fN+pwguXT4kIhZCOLBzFD6Xu4FGR4nlaR1 ga2qsROaX+pnc48si3fFlvqbBJljLv+K+A== X-Google-Smtp-Source: AA6agR5NW144ZfVn+wheoGhEftxQqYSWKYS0FZ3rWk5tYDJVQxEzEPVI/1FGDL75P4yyj6SGzh0B2A== X-Received: by 2002:adf:e781:0:b0:228:b44c:d0f7 with SMTP id n1-20020adfe781000000b00228b44cd0f7mr667881wrm.243.1662362778558; Mon, 05 Sep 2022 00:26:18 -0700 (PDT) Received: from poulhies-Precision-5550 (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id m11-20020a056000180b00b002287d99b455sm2671297wrh.15.2022.09.05.00.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 00:26:18 -0700 (PDT) Date: Mon, 5 Sep 2022 09:26:17 +0200 From: Marc =?iso-8859-1?Q?Poulhi=E8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [Ada] Fix inconsistent building of itypes for null array aggregates Message-ID: <20220905072617.GA1174888@poulhies-Precision-5550> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="AhhlLboLdkugWU4S" Content-Disposition: inline X-Spam-Status: No, score=-12.9 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 List-Id: --AhhlLboLdkugWU4S Content-Type: text/plain; charset=us-ascii Content-Disposition: inline To analyze Ada 2022 null array aggregates we introduced a dedicated routine and bypassed the code for ordinary array aggregates. However, the types for the array indexes created by this dedicated routine differed from the types created for ordinary array aggregates, i.e. itypes for null array aggregates were associated with the array subtype declaration, while itypes for ordinary array aggregates were associated with the aggregate itself. These differences cause trouble for various routines in GNATprove. This patch reduces the special handling of null array aggregates and reuses the building of itypes for ordinary array aggregates. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_aggr.adb (Array_Aggr_Subtype): Bypass call to Collect_Aggr_Bound with dedicated code for null array aggregates. (Resolve_Array_Aggregate): Remove special handling of null array aggregates. (Resolve_Array_Aggregate): Create bounds, but let Array_Aggr_Subtype create itype entities. --AhhlLboLdkugWU4S Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch.diff" diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -567,7 +567,29 @@ package body Sem_Aggr is end if; Set_Parent (Index_Constraints, N); - Collect_Aggr_Bounds (N, 1); + + -- When resolving a null aggregate we created a list of aggregate bounds + -- for the consecutive dimensions. The bounds for the first dimension + -- are attached as the Aggregate_Bounds of the aggregate node. + + if Is_Null_Aggregate (N) then + declare + This_Range : Node_Id := Aggregate_Bounds (N); + begin + for J in 1 .. Aggr_Dimension loop + Aggr_Range (J) := This_Range; + Next_Index (This_Range); + + -- Remove bounds from the list, so they can be reattached as + -- the First_Index/Next_Index again by the code that also + -- handles non-null aggregates. + + Remove (Aggr_Range (J)); + end loop; + end; + else + Collect_Aggr_Bounds (N, 1); + end if; -- Build the list of constrained indexes of our aggregate itype @@ -1203,9 +1225,6 @@ package body Sem_Aggr is Aggr_Subtyp := Any_Composite; - elsif Is_Null_Aggr then - Aggr_Subtyp := Etype (N); - else Aggr_Subtyp := Array_Aggr_Subtype (N, Typ); end if; @@ -4084,16 +4103,16 @@ package body Sem_Aggr is Typ : constant Entity_Id := Etype (N); Check : Node_Id; - Decl : Node_Id; Index : Node_Id; Lo, Hi : Node_Id; Constr : constant List_Id := New_List; - Subt : constant Entity_Id := - Create_Itype (Ekind => E_Array_Subtype, - Related_Nod => N, - Suffix => 'S'); begin + -- Attach the list of constraints at the location of the aggregate, so + -- the individual constraints can be analyzed. + + Set_Parent (Constr, N); + -- Create a constrained subtype with null dimensions Index := First_Index (Typ); @@ -4120,25 +4139,14 @@ package body Sem_Aggr is Insert_Action (N, Check); - Append (Make_Range (Loc, Lo, Hi), Constr); + Append (Make_Range (Loc, New_Copy_Tree (Lo), Hi), Constr); + Analyze_And_Resolve (Last (Constr), Etype (Index)); Index := Next_Index (Index); end loop; - Decl := Make_Subtype_Declaration (Loc, - Defining_Identifier => Subt, - Subtype_Indication => - Make_Subtype_Indication (Loc, - Subtype_Mark => - New_Occurrence_Of (Base_Type (Typ), Loc), - Constraint => - Make_Index_Or_Discriminant_Constraint (Loc, Constr))); - - Insert_Action (N, Decl); - Analyze (Decl); - Set_Etype (N, Subt); Set_Compile_Time_Known_Aggregate (N); - Set_Aggregate_Bounds (N, New_Copy_Tree (First_Index (Etype (N)))); + Set_Aggregate_Bounds (N, First (Constr)); return True; end Resolve_Null_Array_Aggregate; --AhhlLboLdkugWU4S--