Merge branch 'topic/fix_deeply_inlining' into 'master'

Fix the "Deeply_Nested_Inlining" rule

Closes #407

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

Author: HugoGGuerrier

lkql_checker/share/lkql/deeply_nested_inlining.lkql

@@ -7,12 +7,11 @@ fun inlined_body(name) = match name.p_referenced_decl()
     | b@BaseSubpBody when b?.p_has_aspect("Inline")
                       => b
     | EnumLiteralDecl => null
-    | GenericSubpInstantiation(f_generic_subp_name: *(
-                               p_referenced_decl(): b@GenericSubpDecl(
-                               p_has_aspect("Inline"): true)))
-                      => b?.p_body_part()
-    | d@BasicDecl when d?.p_is_subprogram() and d?.p_has_aspect("Inline")
-                      => d?.p_body_part()
+    | g@GenericSubpInstantiation(f_generic_subp_name: *(p_referenced_decl(): b@GenericSubpDecl))
+      when b.p_has_aspect("Inline") or g.p_has_aspect("Inline")
+                      => b.p_body_part()
+    | d@BasicDecl when d.p_is_subprogram() and d.p_has_aspect("Inline")
+                      => d.p_body_part()
     | *               => null
 
 # Return true if we reach a level ``n`` of inlining of 0

testsuite/tests/checks/deeply_nested_inlining/deeply_inlined_2012.adb

@@ -35,4 +35,9 @@ package body Deeply_Inlined_2012 is
       New_P4;
    end P5;
 
+   procedure Free (Elem : in out T) is
+   begin
+      Free (Elem.C);
+   end Free;
+
 end Deeply_Inlined_2012;

testsuite/tests/checks/deeply_nested_inlining/deeply_inlined_2012.ads

@@ -1,3 +1,5 @@
+with Ada.Unchecked_Deallocation;
+
 package Deeply_Inlined_2012 is
 
    generic
@@ -18,4 +20,20 @@ package Deeply_Inlined_2012 is
    generic
    procedure P5 with Inline;   --  FLAG
 
+   type T is private;
+
+   procedure Free (Elem : in out T);  --  NOFLAG
+
+private
+   type U is null record;
+   type U_Access is access U;
+
+   procedure Free is new Ada.Unchecked_Deallocation  --  NOFLAG
+     (U, U_Access);
+
+   type T is record
+      C : U_Access;
+   end record;
+
+   pragma Inline (Free);
 end Deeply_Inlined_2012;

testsuite/tests/checks/deeply_nested_inlining/inlined.ads

@@ -1,5 +1,4 @@
 package Inlined is
-
    procedure P0;                --  NOFLAG
    pragma Inline (P0);
 
@@ -17,5 +16,4 @@ package Inlined is
 
    function F2 return Boolean;  --  NOFLAG
    pragma Inline (F2);
-
 end Inlined;

testsuite/tests/checks/deeply_nested_inlining/test.out

@@ -38,11 +38,11 @@ deeply_inlined_2012.adb:32:14: rule violation: deeply nested inlining
 32 |    procedure New_P4 is new P4;   --  FLAG
    |              ^^^^^^
 
-deeply_inlined_2012.ads:16:14: rule violation: deeply nested inlining
-16 |    procedure P4 with Inline;   --  FLAG
+deeply_inlined_2012.ads:18:14: rule violation: deeply nested inlining
+18 |    procedure P4 with Inline;   --  FLAG
    |              ^^
 
-deeply_inlined_2012.ads:19:14: rule violation: deeply nested inlining
-19 |    procedure P5 with Inline;   --  FLAG
+deeply_inlined_2012.ads:21:14: rule violation: deeply nested inlining
+21 |    procedure P5 with Inline;   --  FLAG
    |              ^^