From 6add6091077140e8fda5c809d2763c06b89af5d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Th=C3=A9venoux?= <thevenoux@adacore.com>
Date: Thu, 20 Jun 2024 14:48:51 +0200
Subject: [PATCH] Rework QualExpr xref equation

Resolve QualExpr's prefix by calling xref_type_equation instead of a
simple call to designated_type. This allows to correctly bind names
references used in QualExpr's prefix.
---
 ada/ast.py                                    | 33 ++++++-------
 .../name_resolution/qual_expr_prefix/test.adb | 18 +++++++
 .../name_resolution/qual_expr_prefix/test.out | 47 +++++++++++++++++++
 .../qual_expr_prefix/test.yaml                |  2 +
 4 files changed, 81 insertions(+), 19 deletions(-)
 create mode 100644 testsuite/tests/name_resolution/qual_expr_prefix/test.adb
 create mode 100644 testsuite/tests/name_resolution/qual_expr_prefix/test.out
 create mode 100644 testsuite/tests/name_resolution/qual_expr_prefix/test.yaml

diff --git a/ada/ast.py b/ada/ast.py
index 437fd7c38..491e4a058 100644
--- a/ada/ast.py
+++ b/ada/ast.py
@@ -20977,27 +20977,22 @@ def general_xref_equation(root=(T.Name, No(T.Name))):
 
     @langkit_property(return_type=Equation)
     def xref_equation():
-        typ = Var(Entity.prefix.designated_type_impl)
-
         return (
-            Entity.suffix.sub_equation
-            & Bind(Self.prefix.ref_var, typ)
-            & Bind(Self.suffix.expected_type_var, typ)
+            Entity.prefix.xref_type_equation
+            & Entity.suffix.sub_equation
+            & Bind(Self.suffix.expected_type_var, Self.prefix.ref_var)
             & Entity.suffix.matches_expected_type
-            & Bind(
-                Self.type_var,
-                If(
-                    # A qualified expression that appears as a statement
-                    # denotes a machine code insertion, in GNAT, it is parsed
-                    # as a parameterless procedure call. In that case,
-                    # Self.type_var shouldn't denote any type. Note that we are
-                    # more flexible than Ada since we allow any type to be code
-                    # statements whereas Ada restricts that to types defined in
-                    # package `System.Machine_Code` (see :rmlink:`13.8`).
-                    Entity.parent.is_a(T.CallStmt),
-                    No(AdaNode.entity),
-                    typ
-                )
+            & If(
+                # A qualified expression that appears as a statement
+                # denotes a machine code insertion, in GNAT, it is parsed
+                # as a parameterless procedure call. In that case,
+                # Self.type_var shouldn't denote any type. Note that we are
+                # more flexible than Ada since we allow any type to be code
+                # statements whereas Ada restricts that to types defined in
+                # package `System.Machine_Code` (see :rmlink:`13.8`).
+                Entity.parent.is_a(T.CallStmt),
+                LogicTrue(),
+                Bind(Self.type_var, Self.prefix.ref_var)
             )
         )
 
diff --git a/testsuite/tests/name_resolution/qual_expr_prefix/test.adb b/testsuite/tests/name_resolution/qual_expr_prefix/test.adb
new file mode 100644
index 000000000..0ec6d131c
--- /dev/null
+++ b/testsuite/tests/name_resolution/qual_expr_prefix/test.adb
@@ -0,0 +1,18 @@
+procedure P (N : Natural) is
+   type Root is tagged record
+      My_Val : Natural := 0;
+   end record;
+
+   type Any_Root_Access is access Root'Class;
+
+   Obj : Root;
+
+   Param : Root'Class := Root'Class (Obj);
+
+   X : Any_Root_Access;
+begin
+   --  All the names in the expression below must be resolved
+
+   X := new P.Root'Class'(Param);
+   pragma Test_Statement;
+end;
diff --git a/testsuite/tests/name_resolution/qual_expr_prefix/test.out b/testsuite/tests/name_resolution/qual_expr_prefix/test.out
new file mode 100644
index 000000000..99675b150
--- /dev/null
+++ b/testsuite/tests/name_resolution/qual_expr_prefix/test.out
@@ -0,0 +1,47 @@
+Analyzing test.adb
+##################
+
+Resolving xrefs for node <AssignStmt test.adb:16:4-16:34>
+*********************************************************
+
+Expr: <Id "X" test.adb:16:4-16:5>
+  references:    <DefiningName "X" test.adb:12:4-12:5>
+  type:          <ConcreteTypeDecl ["Any_Root_Access"] test.adb:6:4-6:46>
+  expected type: None
+Expr: <Allocator test.adb:16:9-16:33>
+  type:          <ConcreteTypeDecl ["Any_Root_Access"] test.adb:6:4-6:46>
+  expected type: <ConcreteTypeDecl ["Any_Root_Access"] test.adb:6:4-6:46>
+Expr: <QualExpr test.adb:16:13-16:33>
+  references:    <DefiningName "Root" test.adb:2:9-2:13>
+  type:          <ClasswideTypeDecl ["Root"] test.adb:2:4-4:15>
+  expected type: None
+Expr: <AttributeRef test.adb:16:13-16:25>
+  references:    <DefiningName "Root" test.adb:2:9-2:13>
+  type:          None
+  expected type: None
+Expr: <DottedName test.adb:16:13-16:19>
+  references:    <DefiningName "Root" test.adb:2:9-2:13>
+  type:          None
+  expected type: None
+Expr: <Id "P" test.adb:16:13-16:14>
+  references:    <DefiningName "P" test.adb:1:11-1:12>
+  type:          None
+  expected type: None
+Expr: <Id "Root" test.adb:16:15-16:19>
+  references:    <DefiningName "Root" test.adb:2:9-2:13>
+  type:          None
+  expected type: None
+Expr: <Id "Class" test.adb:16:20-16:25>
+  references:    None
+  type:          None
+  expected type: None
+Expr: <ParenExpr test.adb:16:26-16:33>
+  type:          <ClasswideTypeDecl ["Root"] test.adb:2:4-4:15>
+  expected type: <ClasswideTypeDecl ["Root"] test.adb:2:4-4:15>
+Expr: <Id "Param" test.adb:16:27-16:32>
+  references:    <DefiningName "Param" test.adb:10:4-10:9>
+  type:          <ClasswideTypeDecl ["Root"] test.adb:2:4-4:15>
+  expected type: <ClasswideTypeDecl ["Root"] test.adb:2:4-4:15>
+
+
+Done.
diff --git a/testsuite/tests/name_resolution/qual_expr_prefix/test.yaml b/testsuite/tests/name_resolution/qual_expr_prefix/test.yaml
new file mode 100644
index 000000000..173e325ff
--- /dev/null
+++ b/testsuite/tests/name_resolution/qual_expr_prefix/test.yaml
@@ -0,0 +1,2 @@
+driver: name-resolution
+input_sources: [test.adb]