From: Ed Schonberg Date: Fri, 5 Jul 2013 08:59:49 +0000 (+0000) Subject: sem_prag.adb (Analyze_PPC_In_Decl_Part): For a class-wide condition... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45c9ce986815135f925dbc0199d3932e860d4a02;p=gcc.git sem_prag.adb (Analyze_PPC_In_Decl_Part): For a class-wide condition... 2013-07-05 Ed Schonberg * sem_prag.adb (Analyze_PPC_In_Decl_Part): For a class-wide condition, when replacing the name of a formal by a conversion to the class-wide type, exempt selector names that appear in parameter associations. From-SVN: r200689 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 4122896c915..cc6e97c48bd 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2013-07-05 Ed Schonberg + + * sem_prag.adb (Analyze_PPC_In_Decl_Part): For a class-wide + condition, when replacing the name of a formal by a conversion + to the class-wide type, exempt selector names that appear in + parameter associations. + 2013-06-13 Eric Botcazou * gcc-interface/ada-tree.h (DECL_BY_DOUBLE_REF_P): Delete. diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index e148d05bbf2..0de1ebae055 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -1749,6 +1749,9 @@ package body Sem_Prag is -- accessparameter of type access-to-T is interpreted as having -- type access-to-T'Class. This ensures the expression is well- -- defined for a primitive subprogram of a type descended from T. + -- Note that this replacement is not done for selector names in + -- parameter associations. These carry an entity for reference + -- purposes, but they semantically they are just identifiers. ------------- -- Get_ACW -- @@ -1790,6 +1793,9 @@ package body Sem_Prag is and then Present (Entity (N)) and then Is_Formal (Entity (N)) and then Nkind (Parent (N)) /= N_Type_Conversion + and then + (Nkind (Parent (N)) /= N_Parameter_Association + or else N /= Selector_Name (Parent (N))) then if Etype (Entity (N)) = T then Typ := Class_Wide_Type (T);