Merge branch 'topic/1142' into 'master'

Fix identity_type property to support ParamSpec Closes #1143 See merge request eng/libadalang/libadalang!1471
AdaCore · Nov 21, 2023 · c478a29 · c478a29
2 parents 8c452c0 + 7c53a48
commit c478a29
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/ada/ast.py b/ada/ast.py
@@ -3024,8 +3024,10 @@ def identity_type():
             # An object decl on which you can call 'Identity implies that its
             # type is a task type.
             lambda _=T.ObjectDecl: Self.task_id_type,
-            # As well as for for loop variable declarations
+            # As well as for for loop variable declarations and parameter
+            # specifications.
             lambda _=T.ForLoopVarDecl: Self.task_id_type,
+            lambda _=T.BaseFormalParamDecl: Self.task_id_type,
             lambda _: No(T.BaseTypeDecl.entity)
         )
 

diff --git a/testsuite/tests/name_resolution/identity_attr/test.adb b/testsuite/tests/name_resolution/identity_attr/test.adb
@@ -15,7 +15,7 @@ procedure Test is
    end TT;
 
    X : TT;
-   X_Array : array (1 .. 10) of T;
+   X_Array : array (1 .. 10) of TT;
 begin
    if T'Identity = X'Identity then
       null;
@@ -34,4 +34,17 @@ begin
       end if;
       pragma Test_Statement_UID;
    end loop;
+
+   --  Should also work on ParamSpec
+   declare
+      function F
+        (A_Task  : TT;
+         Compare : Ada.Task_Identification.Task_ID) return Boolean is
+      begin
+         return A_Task'Identity /= Compare;
+         pragma Test_Statement_UID;
+      end F;
+   begin
+      null;
+   end;
 end Test;
diff --git a/testsuite/tests/name_resolution/identity_attr/test.out b/testsuite/tests/name_resolution/identity_attr/test.out
@@ -83,7 +83,7 @@ Expr: <AttributeRef test.adb:32:10-32:20>
   expected type: ada.task_identification.task_id
 Expr: <Id "I" test.adb:32:10-32:11>
   references:    test().i
-  type:          None
+  type:          test().tt
   expected type: None
 Expr: <Id "Identity" test.adb:32:12-32:20>
   references:    None
@@ -114,5 +114,32 @@ Expr: <Id "Current_Task" test.adb:32:47-32:59>
   type:          ada.task_identification.task_id
   expected type: ada.task_identification.task_id
 
+Resolving xrefs for node <ReturnStmt test.adb:44:10-44:44>
+**********************************************************
+
+Expr: <RelationOp test.adb:44:17-44:43>
+  type:          standard.boolean
+  expected type: standard.boolean
+Expr: <AttributeRef test.adb:44:17-44:32>
+  references:    None
+  type:          ada.task_identification.task_id
+  expected type: ada.task_identification.task_id
+Expr: <Id "A_Task" test.adb:44:17-44:23>
+  references:    test().f((test.tt, ada.task_identification.task_id) -> standard.boolean).a_task
+  type:          test().tt
+  expected type: None
+Expr: <Id "Identity" test.adb:44:24-44:32>
+  references:    None
+  type:          None
+  expected type: None
+Expr: <OpNeq "/=" test.adb:44:33-44:35>
+  references:    ada.task_identification."="((ada.task_identification.task_id, ada.task_identification.task_id) -> standard.boolean)
+  type:          None
+  expected type: None
+Expr: <Id "Compare" test.adb:44:36-44:43>
+  references:    test().f((test.tt, ada.task_identification.task_id) -> standard.boolean).compare
+  type:          ada.task_identification.task_id
+  expected type: ada.task_identification.task_id
+
 
 Done.