Merge branch 'topic/regr/07082026' into 'master'

Correct regression caused by new LAL generic renaming nodes Closes #317 See merge request eng/libadalang/langkit-query-language!279
AdaCore · Aug 12, 2024 · 5f94f13 · 5f94f13
2 parents 3ba0f76 + dfa41b3
commit 5f94f13
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/lkql_checker/share/lkql/positional_actuals_for_defaulted_generic_parameters.lkql b/lkql_checker/share/lkql/positional_actuals_for_defaulted_generic_parameters.lkql
@@ -24,8 +24,14 @@ fun check_generic(n, node) =
 fun positional_actuals_for_defaulted_generic_parameters(node) =
     node is ParamAssoc(f_designator: null, parent: l@AssocList)
     when match l.parent
-          | p@GenericSubpInstantiation    =>
-              check_generic(p.f_generic_subp_name, node)
-          | p@GenericPackageInstantiation =>
-              check_generic(p.f_generic_pkg_name, node)
-          | *                             => false
+         | p@GenericSubpInstantiation    =>
+              check_generic(
+                  stdlib.ultimate_generic_alias(p.f_generic_subp_name),
+                  node
+              )
+         | p@GenericPackageInstantiation =>
+              check_generic(
+                  stdlib.ultimate_generic_alias(p.f_generic_pkg_name),
+                  node
+              )
+         | *                             => false
diff --git a/lkql_checker/share/lkql/stdlib.lkql b/lkql_checker/share/lkql/stdlib.lkql
@@ -133,6 +133,13 @@ fun ultimate_subprogram_alias(name) =
                                        .p_referenced_decl())
     else name
 
+@memoized
+fun ultimate_generic_alias(name) =
+    |" Return the ultimately designated ``GenericDecl``, going through renamings
+    match name.p_referenced_decl()
+    | r@GenericRenamingDecl => ultimate_generic_alias(r.f_renames.f_renamed_object)
+    | *                     => name
+
 @memoized
 fun has_local_scope(n) =
     |" Return ``true`` if ``n`` is enclosed in a local scope