From fc4039b93cf1fc1cb12db5cf06b7a9cd3ced2c1a Mon Sep 17 00:00:00 2001 From: Ed Schonberg Date: Wed, 27 Oct 2004 15:41:55 +0200 Subject: sem_ch3.adb (Complete_Private_Subtype): If the full view is a task or protected type with discriminants... 2004-10-26 Ed Schonberg * sem_ch3.adb (Complete_Private_Subtype): If the full view is a task or protected type with discriminants, do not constrain the corresponding record type if the subtype declaration has no discriminant constraints. This can be the case in source code, or in the subtype declaration created to rename an actual type within an instantiation. From-SVN: r89670 --- gcc/ada/sem_ch3.adb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gcc') diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index c48f3b1..fe1cf82 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -7059,9 +7059,15 @@ package body Sem_Ch3 is Set_Primitive_Operations (Full, Primitive_Operations (Full_Base)); Set_Class_Wide_Type (Full, Class_Wide_Type (Full_Base)); + -- If this is a subtype of a protected or task type, constrain its + -- corresponding record, unless this is a subtype without constraints, + -- i.e. a simple renaming as with an actual subtype in an instance. + elsif Is_Concurrent_Type (Full_Base) then if Has_Discriminants (Full) and then Present (Corresponding_Record_Type (Full_Base)) + and then + not Is_Empty_Elmt_List (Discriminant_Constraint (Full)) then Set_Corresponding_Record_Type (Full, Constrain_Corresponding_Record -- cgit v1.1