diff options
Diffstat (limited to 'gcc/ada/exp_ch5.adb')
| -rw-r--r-- | gcc/ada/exp_ch5.adb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb index e720656..307acaa 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 |