From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 29778385842E; Tue, 9 Nov 2021 09:46:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29778385842E MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5022] [Ada] Errors on globals in expressions of predicate aspects in generic bodies X-Act-Checkin: gcc X-Git-Author: Gary Dismukes X-Git-Refname: refs/heads/master X-Git-Oldrev: 1275c4031a7d3b55e127cab53f31362469f8c89b X-Git-Newrev: 64cb8ebef32c44ab7cab6021942df0b3d08a5fe5 Message-Id: <20211109094600.29778385842E@sourceware.org> Date: Tue, 9 Nov 2021 09:46:00 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2021 09:46:00 -0000 https://gcc.gnu.org/g:64cb8ebef32c44ab7cab6021942df0b3d08a5fe5 commit r12-5022-g64cb8ebef32c44ab7cab6021942df0b3d08a5fe5 Author: Gary Dismukes Date: Mon Oct 25 20:45:50 2021 -0400 [Ada] Errors on globals in expressions of predicate aspects in generic bodies gcc/ada/ * sem_ch13.adb (Freeze_Entity_Checks): Analyze the expression of a pragma Predicate associated with an aspect at the freeze point of the type, to ensure that references to globals get saved when the aspect occurs within a generic body. Also, add Aspect_Static_Predicate to the choices of the membership test of the enclosing guard. Diff: --- gcc/ada/sem_ch13.adb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 6059cee0022..be9b84e5ec7 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -13162,6 +13162,7 @@ package body Sem_Ch13 is if Get_Aspect_Id (Ritem) in Aspect_CPU | Aspect_Dynamic_Predicate | Aspect_Predicate + | Aspect_Static_Predicate | Aspect_Priority then -- Retrieve the visibility to components and discriminants @@ -13169,6 +13170,34 @@ package body Sem_Ch13 is Push_Type (E); Check_Aspect_At_Freeze_Point (Ritem); + + -- In the case of predicate aspects, there will be + -- a corresponding Predicate pragma associated with + -- the aspect, and the expression of the pragma also + -- needs to be analyzed at this point, to ensure that + -- Save_Global_References will capture global refs in + -- expressions that occur in generic bodies, for proper + -- later resolution of the pragma in instantiations. + + if Is_Type (E) + and then Inside_A_Generic + and then Has_Predicates (E) + and then Present (Aspect_Rep_Item (Ritem)) + then + declare + Pragma_Args : constant List_Id := + Pragma_Argument_Associations + (Aspect_Rep_Item (Ritem)); + Pragma_Expr : constant Node_Id := + Expression (Next (First (Pragma_Args))); + begin + if Present (Pragma_Expr) then + Analyze_And_Resolve + (Pragma_Expr, Standard_Boolean); + end if; + end; + end if; + Pop_Type (E); else