From: Bob Duff <d...@adacore.com>
This patch fixes a bug where if a selected_component X.Y appears in an
aspect_specification, and there are two or more overloaded Y's in X,
then it can choose the wrong one, leading to subsequent type errors.
It was always picking the last declaration of Y, and leaving Entity
set to that. We now reset Entity (as for the already-existing code
for N_Identifier just below).
Note that Resolve_Aspect_Expressions is called only for
aspect_specifications, and not even all aspect_specifications,
so the bug didn't occur for other names. For example,
Resolve_Aspect_Expressions is not called for aspect_specifications
in the visible part of a library package if there is no private part.
gcc/ada/
* sem_ch13.adb (Resolve_Name): This is called only for names in
aspect_specifications. If the name is an overloaded
selected_component, reset the Entity. Note that this was already
done for N_Identifier in the code just below.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/sem_ch13.adb | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index ed0e61bd7b2..c16a7710594 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -15925,12 +15925,20 @@ package body Sem_Ch13 is
and then Chars (Prefix (N)) /= Chars (E)
then
Find_Selected_Component (N);
+
+ -- Reset the Entity if N is overloaded since the entity might
+ -- not be the correct one; allow later resolution to set it
+ -- properly.
+
+ if Is_Overloaded (N) then
+ Set_Entity (N, Empty);
+ end if;
end if;
return Skip;
- -- Resolve identifiers that are not selectors in parameter
- -- associations (these are never resolved by visibility).
+ -- Resolve identifiers, but not selectors in parameter associations;
+ -- the selectors are never resolved by visibility.
elsif Nkind (N) = N_Identifier
and then Chars (N) /= Chars (E)
@@ -15939,8 +15947,7 @@ package body Sem_Ch13 is
then
Find_Direct_Name (N);
- -- Reset the Entity if N is overloaded since the entity may not
- -- be the correct one.
+ -- Reset the Entity as above for selected_components
if Is_Overloaded (N) then
Set_Entity (N, Empty);
--
2.43.2
