OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Ada] ACATS 4.1P - C432003 - Errors missed on extension aggregates 

2020-06-16  Arnaud Charlet  <charlet@adacore.com>

gcc/ada/

	* sem_aggr.adb (Resolve_Extension_Aggregate): Fix implementation
	of AI05-0115 by checking the correct type.
This commit is contained in:
Arnaud Charlet 2020-04-07 05:22:52 -04:00 committed by Pierre-Marie de Rodat
parent e7680763df
commit 51e2de474e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ada/sem_aggr.adb
View File

@ -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))