[COMMITTED] ada: Refine types for an accessibility-checking routine

Message ID 20230526073545.2067846-1-poulhies@adacore.com
State Committed
Commit da59893d855a2d10e9c94b57c9b2d4d91f05a140
Headers
Series [COMMITTED] ada: Refine types for an accessibility-checking routine |

Commit Message

Marc Poulhiès May 26, 2023, 7:35 a.m. UTC
  From: Piotr Trojanek <trojanek@adacore.com>

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.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/accessibility.adb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Patch

diff --git a/gcc/ada/accessibility.adb b/gcc/ada/accessibility.adb
index c65c26d8875..bc897d1ef18 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