From d57f8e40433cb73fa08fab92b3238a1981c7c037 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Mon, 27 Apr 2020 11:30:06 +0200 Subject: [PATCH] [Ada] Add comments about attribute 'Valid_Scalars on private tagged types 2020-06-19 Piotr Trojanek gcc/ada/ * exp_attr.adb (Expand_N_Attribute_Reference): Add comment. * sem_attr.adb (Analyze_Attribute): Add ??? comment. * sem_util.ads (Valid_Scalars): This routine is only used for 'Valid_Scalars and not for 'Valid. --- gcc/ada/exp_attr.adb | 3 ++- gcc/ada/sem_attr.adb | 4 ++++ gcc/ada/sem_util.ads | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb index 0eead444759..84a36f89a26 100644 --- a/gcc/ada/exp_attr.adb +++ b/gcc/ada/exp_attr.adb @@ -7094,7 +7094,8 @@ package body Exp_Attr is Expr := Empty; - -- Attribute 'Valid_Scalars is not supported on private tagged types + -- Attribute 'Valid_Scalars is not supported on private tagged types; + -- see a detailed explanation where this attribute is analyzed. if Is_Private_Type (Ptyp) and then Is_Tagged_Type (Ptyp) then null; diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index bf45fb84c3b..3bd87fdf3db 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -7016,6 +7016,10 @@ package body Sem_Attr is -- types due to a code generation issue. Is_Visible_Component -- does not allow for a component of a private tagged type to -- be successfully retrieved. + -- ??? This attribute should simply ignore type privacy + -- (see Validated_View). It should examine components of the + -- tagged type extensions (if any) and recursively examine + -- 'Valid_Scalars of the parent's type (if any). -- Do not use Error_Attr_P because this bypasses any subsequent -- processing and leaves the attribute with type Any_Type. This diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads index 7a54b5c52dc..d99edeaa902 100644 --- a/gcc/ada/sem_util.ads +++ b/gcc/ada/sem_util.ads @@ -3050,10 +3050,10 @@ package Sem_Util is -- conversions, and unchecked conversions. function Validated_View (Typ : Entity_Id) return Entity_Id; - -- Obtain the "validated view" of arbitrary type Typ which is suitable - -- for verification by attributes 'Valid and 'Valid_Scalars. This view - -- is the type itself or its full view while stripping away concurrency, - -- derivations, and privacy. + -- Obtain the "validated view" of arbitrary type Typ which is suitable for + -- verification by attributes 'Valid_Scalars. This view is the type itself + -- or its full view while stripping away concurrency, derivations, and + -- privacy. function Visible_Ancestors (Typ : Entity_Id) return Elist_Id; -- [Ada 2012:AI-0125-1]: Collect all the visible parents and progenitors -- 2.30.2