From: Gary Dismukes <[email protected]>
The compiler blows up when analyzing an illegal indexing of a container
object (such as a vector) when the indexing expression has the form of
a named actual parameter and the name given for the parameter does not
match the name of the index formal of the corresponding indexing function
that the compiler identifies for doing the generalized indexing.
gcc/ada/ChangeLog:
* sem_ch4.adb (Try_Container_Indexing): Conditionalize last actual of
call to Error_Msg_NE to avoid blowup on N_Parameter_Association actuals.
Tested on x86_64-pc-linux-gnu (before the recent bootstrap breakage), committed
on master.
---
gcc/ada/sem_ch4.adb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index ad560ee3979..38e013a9dc4 100644
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -9564,7 +9564,12 @@ package body Sem_Ch4 is
if Idx_Type = Any_Type then
Error_Msg_NE
- ("container cannot be indexed with&", N, Etype (First (Exprs)));
+ ("container cannot be indexed with&", N,
+ (if Nkind (First (Exprs)) = N_Parameter_Association
+ then
+ Etype (Explicit_Actual_Parameter (First (Exprs)))
+ else
+ Etype (First (Exprs))));
Rewrite (N, New_Occurrence_Of (Any_Id, Loc));
end if;
--
2.51.0
