-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2010, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2011, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
with Sem_Util; use Sem_Util;
with Snames; use Snames;
with Sinfo; use Sinfo;
+with Targparm; use Targparm;
with Tbuild; use Tbuild;
with Uintp; use Uintp;
while Present (Elmt) loop
Iface_Prim := Node (Elmt);
- if Chars (E) = Chars (Prim)
+ if Chars (Iface) = Chars (Prim)
and then Is_Interface_Conformant
(Tagged_Type, Iface_Prim, Prim)
then
Typ := Etype (Subp);
end if;
- if not Is_Class_Wide_Type (Typ)
+ -- The following should be better commented, especially since
+ -- we just added several new conditions here ???
+
+ if Comes_From_Source (Subp)
and then Is_Interface (Typ)
+ and then not Is_Class_Wide_Type (Typ)
and then not Is_Derived_Type (Typ)
+ and then not Is_Generic_Type (Typ)
+ and then not In_Instance
then
Error_Msg_N ("?declaration of& is too late!", Subp);
Error_Msg_NE
-- New_Stream_Subprogram)
if Present (Old_Subp)
- and then Is_Overriding_Operation (Subp)
+ and then Present (Overridden_Operation (Subp))
and then Is_Dispatching_Operation (Old_Subp)
then
pragma Assert
- ((Ekind (Subp) = E_Function
- and then Is_Dispatching_Operation (Old_Subp)
- and then Is_Null_Extension (Base_Type (Etype (Subp))))
- or else
- (Ekind (Subp) = E_Procedure
- and then Is_Dispatching_Operation (Old_Subp)
- and then Present (Alias (Old_Subp))
- and then Is_Null_Interface_Primitive
+ ((Ekind (Subp) = E_Function
+ and then Is_Dispatching_Operation (Old_Subp)
+ and then Is_Null_Extension (Base_Type (Etype (Subp))))
+ or else
+ (Ekind (Subp) = E_Procedure
+ and then Is_Dispatching_Operation (Old_Subp)
+ and then Present (Alias (Old_Subp))
+ and then Is_Null_Interface_Primitive
(Ultimate_Alias (Old_Subp)))
- or else Get_TSS_Name (Subp) = TSS_Stream_Read
- or else Get_TSS_Name (Subp) = TSS_Stream_Write);
+ or else Get_TSS_Name (Subp) = TSS_Stream_Read
+ or else Get_TSS_Name (Subp) = TSS_Stream_Write);
Check_Controlling_Formals (Tagged_Type, Subp);
Override_Dispatching_Operation (Tagged_Type, Old_Subp, Subp);
" the type!", Subp);
end if;
+ -- No code required to register primitives in VM
+ -- targets
+
+ elsif VM_Target /= No_VM then
+ null;
+
else
Insert_Actions_After (Subp_Body,
Register_Primitive (Sloc (Subp_Body),
end if;
-- Indicate that this is an overriding operation,
- -- and replace the overriden entry in the list of
+ -- and replace the overridden entry in the list of
-- primitive operations, which is used for xref
-- generation subsequently.
and then Is_Controlled (Tagged_Type)
and then not Is_Visibly_Controlled (Tagged_Type)
then
- Set_Is_Overriding_Operation (Subp, False);
+ Set_Overridden_Operation (Subp, Empty);
-- If the subprogram specification carries an overriding
-- indicator, no need for the warning: it is either redundant,
else
Override_Dispatching_Operation (Tagged_Type, Ovr_Subp, Subp);
- Set_Is_Overriding_Operation (Subp);
-- Ada 2005 (AI-251): In case of late overriding of a primitive
-- that covers abstract interface subprograms we must register it
-- in all the secondary dispatch tables associated with abstract
- -- interfaces. We do this now only if not building static tables.
- -- Otherwise the patch code is emitted after those tables are
- -- built, to prevent access_before_elaboration in gigi.
-
- if Body_Is_Last_Primitive then
+ -- interfaces. We do this now only if not building static tables,
+ -- nor when the expander is inactive (we avoid trying to register
+ -- primitives in semantics-only mode, since the type may not have
+ -- an associated dispatch table). Otherwise the patch code is
+ -- emitted after those tables are built, to prevent access before
+ -- elaboration in gigi.
+
+ if Body_Is_Last_Primitive and then Full_Expander_Active then
declare
Subp_Body : constant Node_Id := Unit_Declaration_Node (Subp);
Elmt : Elmt_Id;
while Present (Elmt) loop
Prim := Node (Elmt);
+ -- No code required to register primitives in VM targets
+
if Present (Alias (Prim))
and then Present (Interface_Alias (Prim))
and then Alias (Prim) = Subp
and then not Building_Static_DT (Tagged_Type)
+ and then VM_Target = No_VM
then
Insert_Actions_After (Subp_Body,
Register_Primitive (Sloc (Subp_Body), Prim => Prim));
elsif Has_Controlled_Component (Tagged_Type)
and then
- (Chars (Subp) = Name_Initialize
- or else
- Chars (Subp) = Name_Adjust
- or else
- Chars (Subp) = Name_Finalize)
+ (Chars (Subp) = Name_Initialize or else
+ Chars (Subp) = Name_Adjust or else
+ Chars (Subp) = Name_Finalize or else
+ Chars (Subp) = Name_Finalize_Address)
then
declare
F_Node : constant Node_Id := Freeze_Node (Tagged_Type);
Old_Bod : Node_Id;
Old_Spec : Entity_Id;
- C_Names : constant array (1 .. 3) of Name_Id :=
+ C_Names : constant array (1 .. 4) of Name_Id :=
(Name_Initialize,
Name_Adjust,
- Name_Finalize);
+ Name_Finalize,
+ Name_Finalize_Address);
- D_Names : constant array (1 .. 3) of TSS_Name_Type :=
+ D_Names : constant array (1 .. 4) of TSS_Name_Type :=
(TSS_Deep_Initialize,
TSS_Deep_Adjust,
- TSS_Deep_Finalize);
+ TSS_Deep_Finalize,
+ TSS_Finalize_Address);
begin
-- Remove previous controlled function which was constructed and
Op1, Op2 : Elmt_Id;
Prev : Elmt_Id := No_Elmt;
- function Derives_From (Proc : Entity_Id) return Boolean;
- -- Check that Subp has the signature of an operation derived from Proc.
- -- Subp has an access parameter that designates Typ.
+ function Derives_From (Parent_Subp : Entity_Id) return Boolean;
+ -- Check that Subp has profile of an operation derived from Parent_Subp.
+ -- Subp must have a parameter or result type that is Typ or an access
+ -- parameter or access result type that designates Typ.
------------------
-- Derives_From --
------------------
- function Derives_From (Proc : Entity_Id) return Boolean is
+ function Derives_From (Parent_Subp : Entity_Id) return Boolean is
F1, F2 : Entity_Id;
begin
- if Chars (Proc) /= Chars (Subp) then
+ if Chars (Parent_Subp) /= Chars (Subp) then
return False;
end if;
- F1 := First_Formal (Proc);
+ -- Check that the type of controlling formals is derived from the
+ -- parent subprogram's controlling formal type (or designated type
+ -- if the formal type is an anonymous access type).
+
+ F1 := First_Formal (Parent_Subp);
F2 := First_Formal (Subp);
while Present (F1) and then Present (F2) loop
if Ekind (Etype (F1)) = E_Anonymous_Access_Type then
elsif Ekind (Etype (F2)) = E_Anonymous_Access_Type then
return False;
- elsif Etype (F1) /= Etype (F2) then
+ elsif Etype (F1) = Parent_Typ and then Etype (F2) /= Full then
return False;
end if;
Next_Formal (F2);
end loop;
+ -- Check that a controlling result type is derived from the parent
+ -- subprogram's result type (or designated type if the result type
+ -- is an anonymous access type).
+
+ if Ekind (Parent_Subp) = E_Function then
+ if Ekind (Subp) /= E_Function then
+ return False;
+
+ elsif Ekind (Etype (Parent_Subp)) = E_Anonymous_Access_Type then
+ if Ekind (Etype (Subp)) /= E_Anonymous_Access_Type then
+ return False;
+
+ elsif Designated_Type (Etype (Parent_Subp)) = Parent_Typ
+ and then Designated_Type (Etype (Subp)) /= Full
+ then
+ return False;
+ end if;
+
+ elsif Ekind (Etype (Subp)) = E_Anonymous_Access_Type then
+ return False;
+
+ elsif Etype (Parent_Subp) = Parent_Typ
+ and then Etype (Subp) /= Full
+ then
+ return False;
+ end if;
+
+ elsif Ekind (Subp) = E_Function then
+ return False;
+ end if;
+
return No (F1) and then No (F2);
end Derives_From;
if Present (Tagged_Type) and then Is_Tagged_Type (Tagged_Type) then
Append_Unique_Elmt (Old_Subp, Primitive_Operations (Tagged_Type));
- -- If Old_Subp isn't already marked as dispatching then
- -- this is the case of an operation of an untagged private
- -- type fulfilled by a tagged type that overrides an
- -- inherited dispatching operation, so we set the necessary
- -- dispatching attributes here.
+ -- If Old_Subp isn't already marked as dispatching then this is
+ -- the case of an operation of an untagged private type fulfilled
+ -- by a tagged type that overrides an inherited dispatching
+ -- operation, so we set the necessary dispatching attributes here.
if not Is_Dispatching_Operation (Old_Subp) then
-- If the untagged type has no discriminants, and the full
- -- view is constrained, there will be a spurious mismatch
- -- of subtypes on the controlling arguments, because the tagged
+ -- view is constrained, there will be a spurious mismatch of
+ -- subtypes on the controlling arguments, because the tagged
-- type is the internal base type introduced in the derivation.
-- Use the original type to verify conformance, rather than the
-- base type.
then
return Controlling_Argument (Orig_Node);
+ -- Type conversions are dynamically tagged if the target type, or its
+ -- designated type, are classwide. An interface conversion expands into
+ -- a dereference, so test must be performed on the original node.
+
+ elsif Nkind (Orig_Node) = N_Type_Conversion
+ and then Nkind (N) = N_Explicit_Dereference
+ and then Is_Controlling_Actual (N)
+ then
+ declare
+ Target_Type : constant Entity_Id :=
+ Entity (Subtype_Mark (Orig_Node));
+
+ begin
+ if Is_Class_Wide_Type (Target_Type) then
+ return N;
+
+ elsif Is_Access_Type (Target_Type)
+ and then Is_Class_Wide_Type (Designated_Type (Target_Type))
+ then
+ return N;
+
+ else
+ return Empty;
+ end if;
+ end;
+
-- Normal case
elsif Is_Controlling_Actual (N)
begin
-- This Ada 2012 rule is valid only for type extensions or private
- -- extensions
+ -- extensions.
if No (Tag_Typ)
or else not Is_Record_Type (Tag_Typ)
Prim := Node (Elmt);
-- Find an inherited hidden dispatching primitive with the name of S
- -- and a type-conformant profile
+ -- and a type-conformant profile.
if Present (Alias (Prim))
and then Is_Hidden (Alias (Prim))
begin
-- The original corresponding operation of Prim must be an
- -- operation of a visible ancestor of the dispatching type
- -- of S, and the original corresponding operation of S2 must
- -- be visible.
+ -- operation of a visible ancestor of the dispatching type S,
+ -- and the original corresponding operation of S2 must be
+ -- visible.
Orig_Prim := Original_Corresponding_Operation (Prim);
and then Is_Immediately_Visible (Orig_Prim)
then
Vis_Ancestor := First_Elmt (Vis_List);
-
while Present (Vis_Ancestor) loop
Elmt :=
First_Elmt (Primitive_Operations (Node (Vis_Ancestor)));
if Node (Elmt) = Orig_Prim then
Set_Overridden_Operation (S, Prim);
Set_Alias (Prim, Orig_Prim);
-
return Prim;
end if;
begin
pragma Assert (Is_Interface (Find_Dispatching_Type (Iface_Prim))
or else (Present (Alias (Iface_Prim))
- and then
- Is_Interface
- (Find_Dispatching_Type (Ultimate_Alias (Iface_Prim)))));
+ and then
+ Is_Interface
+ (Find_Dispatching_Type (Ultimate_Alias (Iface_Prim)))));
-- Search in the homonym chain. Done to speed up locating visible
-- entities and required to catch primitives associated with the partial
end if;
end if;
+ -- Check if E covers the interface primitive (includes case in
+ -- which E is an inherited private primitive).
+
+ if Is_Interface_Conformant (Tagged_Type, Iface_Prim, E) then
+ return E;
+ end if;
+
-- Use the internal entity that links the interface primitive with
- -- the covering primitive to locate the entity
+ -- the covering primitive to locate the entity.
elsif Interface_Alias (E) = Iface_Prim then
return Alias (E);
if not Has_Controlling_Result (Nam) then
return False;
+ -- The function may have a controlling result, but if the return type
+ -- is not visibly tagged, then this is not tag-indeterminate.
+
+ elsif Is_Access_Type (Etype (Nam))
+ and then not Is_Tagged_Type (Designated_Type (Etype (Nam)))
+ then
+ return False;
+
-- An explicit dereference means that the call has already been
-- expanded and there is no tag to propagate.
if Is_Controlling_Actual (Actual)
and then not Is_Tag_Indeterminate (Actual)
then
- return False; -- one operand is dispatching
+ -- One operand is dispatching
+
+ return False;
end if;
Next_Actual (Actual);
then
return True;
- -- In Ada 2005 a function that returns an anonymous access type can
- -- dispatching, and the dereference of a call to such a function
- -- is also tag-indeterminate.
+ -- In Ada 2005, a function that returns an anonymous access type can be
+ -- dispatching, and the dereference of a call to such a function can
+ -- also be tag-indeterminate if the call itself is.
elsif Nkind (Orig_Node) = N_Explicit_Dereference
and then Ada_Version >= Ada_2005
-- The location of entities that come from source in the list of
-- primitives of the tagged type must follow their order of occurrence
- -- in the sources to fulfill the C++ ABI. If the overriden entity is a
- -- primitive of an interface that is not an ancestor of this tagged
- -- type (that is, it is an entity added to the list of primitives by
- -- Derive_Interface_Progenitors), then we must append the new entity
- -- at the end of the list of primitives.
+ -- in the sources to fulfill the C++ ABI. If the overridden entity is a
+ -- primitive of an interface that is not implemented by the parents of
+ -- this tagged type (that is, it is an alias of an interface primitive
+ -- generated by Derive_Interface_Progenitors), then we must append the
+ -- new entity at the end of the list of primitives.
if Present (Alias (Prev_Op))
+ and then Etype (Tagged_Type) /= Tagged_Type
and then Is_Interface (Find_Dispatching_Type (Alias (Prev_Op)))
and then not Is_Ancestor (Find_Dispatching_Type (Alias (Prev_Op)),
- Tagged_Type)
+ Tagged_Type, Use_Full_View => True)
+ and then not Implements_Interface
+ (Etype (Tagged_Type),
+ Find_Dispatching_Type (Alias (Prev_Op)))
then
Remove_Elmt (Primitive_Operations (Tagged_Type), Elmt);
Append_Elmt (New_Op, Primitive_Operations (Tagged_Type));
- -- The new primitive replaces the overriden entity. Required to ensure
+ -- The new primitive replaces the overridden entity. Required to ensure
-- that overriding primitive is assigned the same dispatch table slot.
else
-- Make the overriding operation into an alias of the implicit one.
-- In this fashion a call from outside ends up calling the new body
- -- even if non-dispatching, and a call from inside calls the
- -- overriding operation because it hides the implicit one. To
- -- indicate that the body of Prev_Op is never called, set its
- -- dispatch table entity to Empty. If the overridden operation
- -- has a dispatching result, so does the overriding one.
+ -- even if non-dispatching, and a call from inside calls the over-
+ -- riding operation because it hides the implicit one. To indicate
+ -- that the body of Prev_Op is never called, set its dispatch table
+ -- entity to Empty. If the overridden operation has a dispatching
+ -- result, so does the overriding one.
Set_Alias (Prev_Op, New_Op);
Set_DTC_Entity (Prev_Op, Empty);
then
return;
+ -- When expansion is suppressed, an unexpanded call to 'Input can occur,
+ -- and in that case we can simply return.
+
+ elsif Nkind (Actual) = N_Attribute_Reference then
+ pragma Assert (Attribute_Name (Actual) = Name_Input);
+
+ return;
+
-- Only other possibilities are parenthesized or qualified expression,
-- or an expander-generated unchecked conversion of a function call to
-- a stream Input attribute.
end if;
Arg := First_Actual (Call_Node);
-
while Present (Arg) loop
if Is_Tag_Indeterminate (Arg) then
Propagate_Tag (Control, Arg);
OSDN Git Service
