Merge branch 'topic/523' into 'master'

overriding_indicators: fix detection of late primtives

Closes #523

See merge request eng/libadalang/langkit-query-language!510

Author: thvnx

lkql_checker/share/lkql/overriding_indicators.lkql

@@ -50,7 +50,18 @@ fun is_overriding_subprogram(node) =
             p_primitive_subp_first_type(): t@TypeDecl(
                 p_base_type(): bt@TypeDecl(
                     p_get_primitives(): primitives@(not null)
-                    when stdlib.any([p for p in primitives if match_signature(node, p, t, bt)])
+                    when stdlib.any(
+                       [p for p in primitives
+                          # The primitive should match it's ancestor counterpart
+                          if match_signature(node, p, t, bt)
+                          # And, it should be inherited to be overrode (i.e.,
+                          # we can't override late primitives).
+                          and stdlib.any(
+                             [i for i in t.p_get_primitives(only_inherited=true)
+                             if match_signature(i, p, bt, bt)]
+                          )
+                       ]
+                    )
                 )
             )
         )

testsuite/tests/checks/overriding_indicators/late.adb

@@ -0,0 +1,22 @@
+package body Late is
+   function Prim (Arg: T_Ancestor) return Float is
+   begin
+      return 0.1;
+   end Prim;
+
+   function Prim (Arg: T_Descendant) return Float is  -- FLAG
+   begin
+      return 0.2;
+   end Prim;
+
+
+   function Late_Prim (Arg: T_Ancestor) return Float is
+   begin
+      return 0.1;
+   end Late_Prim;
+
+   function Late_Prim (Arg: T_Descendant) return Float is  -- NOFLAG
+   begin
+      return 0.2;
+   end Late_Prim;
+end Late;

testsuite/tests/checks/overriding_indicators/late.ads

@@ -0,0 +1,19 @@
+package Late is
+   type T_Ancestor is null record;
+
+   function Prim (Arg: T_Ancestor) return Float;
+
+   type T_Descendant is new T_Ancestor;
+
+   -- "Late" primitive of T_Ancestor. Can't be inherited by types declared
+   -- before in the source Code.
+   function Late_Prim (Arg: T_Ancestor) return Float;
+
+   -- The following operation cannot override the primive of T_Ancestor because
+   -- the latter is not inherited by T_Descendant since the primitive of
+   -- T_Ancestor has been declared *after* the declaration of T_Descendant.
+   function Late_Prim (Arg: T_Descendant) return Float; -- NOFLAG
+
+   -- The following operation override the primitive of T_Ancestor
+   function Prim (Arg: T_Descendant) return Float; -- FLAG
+end Late;

testsuite/tests/checks/overriding_indicators/test.out

@@ -46,3 +46,11 @@ test-prim3.adb:2:11: rule violation: missing overriding indicator
 2 | procedure Prim3 (Self : T6; Other : Integer) is  --  FLAG
   |           ^^^^^
 
+late.ads:18:13: rule violation: missing overriding indicator
+18 |    function Prim (Arg: T_Descendant) return Float; -- FLAG
+   |             ^^^^
+
+late.adb:7:13: rule violation: missing overriding indicator
+7 |    function Prim (Arg: T_Descendant) return Float is  -- FLAG
+  |             ^^^^
+

testsuite/tests/checks/overriding_indicators/test.yaml

@@ -1,3 +1,3 @@
 driver: 'checker'
 rule_name: overriding_indicators
-input_sources: ['test.ads', 'test.adb', 'test-prim3.adb']
+input_sources: ['test.ads', 'test.adb', 'test-prim3.adb', 'late.ads', 'late.adb']