Revert partially previous changes, unrelated to the change at hand.
From-SVN: r139271
-- Generic_Renamings (Elist23) (for an instance)
-- Inner_Instances (Elist23) (generic function only)
-- Protection_Object (Node23) (for concurrent kind)
- -- Spec_PPC_List (Node24)
-- Interface_Alias (Node25)
-- Overridden_Operation (Node26)
-- Wrapped_Entity (Node27) (non-generic case only)
-- in the limited case, the ancestor part must be either a
-- function call (possibly qualified, or wrapped in an unchecked
-- conversion) or aggregate (definitely qualified).
- -- The ancestor part can also be a function call (that may be
- -- transformed into an explicit dereference) or a qualification
- -- of one such.
elsif Is_Limited_Type (Etype (A))
and then Nkind (Unqualify (A)) /= N_Function_Call -- aggregate?
- and then Nkind (Unqualify (A)) /= N_Explicit_Dereference
and then
(Nkind (Unqualify (A)) /= N_Unchecked_Type_Conversion
or else
Prot_Id : Entity_Id;
begin
- -- If the subprogram is a function with an anonymous access
- -- to protected subprogram, it must be expanded to create
- -- its equivalent type.
-
- -- if Ekind (Typ) = E_Anonymous_Access_Protected_Subprogram_Type then
- -- Expand_Access_Protected_Subprogram_Type (N, Typ);
- -- end if;
-
-- Deal with case of protected subprogram. Do not generate protected
-- operation if operation is flagged as eliminated.
-- routine to make sure Complete_Master is called on exit).
procedure Expand_Access_Protected_Subprogram_Type (N : Node_Id);
- -- Build Equivalent_Type for an Access_To_Protected_Subprogram.
- -- Equivalent_Type is a record type with two components: a pointer
- -- to the protected object, and a pointer to the operation itself.
+ -- Build Equivalent_Type for an Access_to_protected_Subprogram
procedure Expand_Accept_Declarations (N : Node_Id; Ent : Entity_Id);
-- Expand declarations required for accept statement. See bodies of
then
return True;
+ -- An aggregate is compatible with an array or record type
+
elsif T2 = Any_Composite
and then Ekind (T1) in E_Array_Type .. E_Record_Subtype
then