From: Piotr Trojanek Date: Wed, 1 Feb 2023 20:47:32 +0000 (+0100) Subject: ada: Refine types for an accessibility-checking routine X-Git-Tag: basepoints/gcc-15~8881 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da59893d855a2d10e9c94b57c9b2d4d91f05a140;p=thirdparty%2Fgcc.git ada: Refine types for an accessibility-checking routine Code cleanup related to work on expression functions for GNATprove (which require accessibility checks even when they are not expanded and thus have no explicit return statements). gcc/ada/ * accessibility.adb (Is_Formal_Of_Current_Function): This routine expects an entity reference and not the entity itself, so its parameter is a Node_Id and not an Entity_Id. --- diff --git a/gcc/ada/accessibility.adb b/gcc/ada/accessibility.adb index c65c26d88756..bc897d1ef18c 100644 --- a/gcc/ada/accessibility.adb +++ b/gcc/ada/accessibility.adb @@ -1153,7 +1153,7 @@ package body Accessibility is -- Obtain the first selector or choice from a given association function Is_Formal_Of_Current_Function - (Assoc_Expr : Entity_Id) return Boolean; + (Assoc_Expr : Node_Id) return Boolean; -- Predicate to test if a given expression associated with a -- discriminant is a formal parameter to the function in which the -- return construct we checking applies to. @@ -1180,7 +1180,7 @@ package body Accessibility is ----------------------------------- function Is_Formal_Of_Current_Function - (Assoc_Expr : Entity_Id) return Boolean is + (Assoc_Expr : Node_Id) return Boolean is begin return Is_Entity_Name (Assoc_Expr) and then Enclosing_Subprogram