From 51e2de474edf2be4997862eb878a5abf5b2a323b Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 7 Apr 2020 05:22:52 -0400 Subject: [PATCH] [Ada] ACATS 4.1P - C432003 - Errors missed on extension aggregates 2020-06-16 Arnaud Charlet gcc/ada/ * sem_aggr.adb (Resolve_Extension_Aggregate): Fix implementation of AI05-0115 by checking the correct type. --- gcc/ada/sem_aggr.adb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 210779c7ded..3152305194c 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -3084,14 +3084,12 @@ package body Sem_Aggr is Analyze (A); Check_Parameterless_Call (A); - -- In SPARK, the ancestor part cannot be a type mark - if Is_Entity_Name (A) and then Is_Type (Entity (A)) then -- AI05-0115: if the ancestor part is a subtype mark, the ancestor -- must not have unknown discriminants. - if Has_Unknown_Discriminants (Root_Type (Typ)) then + if Has_Unknown_Discriminants (Entity (A)) then Error_Msg_NE ("aggregate not available for type& whose ancestor " & "has unknown discriminants", N, Typ); @@ -4291,6 +4289,10 @@ package body Sem_Aggr is -- AI05-0115: if the ancestor part is a subtype mark, the ancestor -- must not have unknown discriminants. + -- ??? We are not checking any subtype mark here and this code is not + -- exercised by any test, so it's likely wrong (in particular + -- we should not use Root_Type here but the subtype mark, if any), + -- and possibly not needed. if Is_Derived_Type (Typ) and then Has_Unknown_Discriminants (Root_Type (Typ)) -- 2.30.2