From 4056d9abfa67e3584f68e1c2ecb8de9bc05a68cf Mon Sep 17 00:00:00 2001 From: Ed Schonberg Date: Tue, 10 Nov 2020 10:16:49 -0500 Subject: [PATCH] [Ada] Spurious error on iterator over container with modified private part gcc/ada/ * exp_ch5.adb (Expand_Iterator_Loop_Over_Container): Check the signature of the private operation Get_Element_Access to prevent accidental use of a user-defined homonym subprogram. --- gcc/ada/exp_ch5.adb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb index e720656d847..307acaae61a 100644 --- a/gcc/ada/exp_ch5.adb +++ b/gcc/ada/exp_ch5.adb @@ -4346,10 +4346,21 @@ package body Exp_Ch5 is Iter_Pack := Scope (Root_Type (Etype (Iter_Type))); -- Find declarations needed for "for ... of" optimization + -- These declarations come from GNAT sources or sources + -- derived from them. User code may include additional + -- overloadings with similar names, and we need to perforn + -- some reasonable resolution to find the needed primitives. + -- It is unclear whether this mechanism is fragile if a user + -- makes arbitrary changes to the private part of a package + -- that supports iterators. Ent := First_Entity (Pack); while Present (Ent) loop - if Chars (Ent) = Name_Get_Element_Access then + if Chars (Ent) = Name_Get_Element_Access + and then Present (First_Formal (Ent)) + and then Chars (First_Formal (Ent)) = Name_Position + and then No (Next_Formal (First_Formal (Ent))) + then Fast_Element_Access_Op := Ent; elsif Chars (Ent) = Name_Step -- 2.30.2