-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2009, 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- --
--- ware Foundation; either version 2, or (at your option) any later ver- --
+-- ware Foundation; either version 3, or (at your option) any later ver- --
-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-- for more details. You should have received a copy of the GNU General --
--- Public License distributed with GNAT; see file COPYING. If not, write --
--- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
--- Boston, MA 02110-1301, USA. --
+-- Public License distributed with GNAT; see file COPYING3. If not, go to --
+-- http://www.gnu.org/licenses for a complete copy of the license. --
-- --
-- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. --
with Exp_Pakd; use Exp_Pakd;
with Exp_Tss; use Exp_Tss;
with Exp_Util; use Exp_Util;
+with Exp_VFpt; use Exp_VFpt;
with Fname; use Fname;
with Freeze; use Freeze;
-with Hostparm; use Hostparm;
with Inline; use Inline;
with Lib; use Lib;
+with Namet; use Namet;
with Nlists; use Nlists;
with Nmake; use Nmake;
with Opt; use Opt;
with Rident; use Rident;
with Rtsfind; use Rtsfind;
with Sem; use Sem;
+with Sem_Aux; use Sem_Aux;
with Sem_Ch6; use Sem_Ch6;
with Sem_Ch8; use Sem_Ch8;
with Sem_Ch12; use Sem_Ch12;
with Sem_Dist; use Sem_Dist;
with Sem_Mech; use Sem_Mech;
with Sem_Res; use Sem_Res;
+with Sem_SCIL; use Sem_SCIL;
with Sem_Util; use Sem_Util;
with Sinfo; use Sinfo;
with Snames; use Snames;
with Stand; use Stand;
with Tbuild; use Tbuild;
-with Ttypes; use Ttypes;
with Uintp; use Uintp;
with Validsw; use Validsw;
procedure Add_Final_List_Actual_To_Build_In_Place_Call
(Function_Call : Node_Id;
- Function_Id : Entity_Id);
+ Function_Id : Entity_Id;
+ Acc_Type : Entity_Id;
+ Sel_Comp : Node_Id := Empty);
-- Ada 2005 (AI-318-02): For a build-in-place call, if the result type has
- -- controlled parts, add an actual parameter that is a pointer to caller's
- -- finalization list.
+ -- controlled parts, add an actual parameter that is a pointer to
+ -- appropriate finalization list. The finalization list is that of the
+ -- current scope, except for "new Acc'(F(...))" in which case it's the
+ -- finalization list of the access type returned by the allocator. Acc_Type
+ -- is that type in the allocator case; Empty otherwise. If Sel_Comp is
+ -- not Empty, then it denotes a selected component and the finalization
+ -- list is obtained from the _controller list of the prefix object.
procedure Add_Task_Actuals_To_Build_In_Place_Call
(Function_Call : Node_Id;
--
-- A := TypeA (Temp);
--
- -- after the call. Here TypeA is the actual type of variable A.
- -- For out parameters, the initial declaration has no expression.
- -- If A is not an entity name, we generate instead:
+ -- after the call. Here TypeA is the actual type of variable A. For out
+ -- parameters, the initial declaration has no expression. If A is not an
+ -- entity name, we generate instead:
--
-- Var : TypeA renames A;
-- Temp : T := Var; -- omitting expression for out parameter.
-- For other in-out parameters, we emit the required constraint checks
-- before and/or after the call.
--
- -- For all parameter modes, actuals that denote components and slices
- -- of packed arrays are expanded into suitable temporaries.
+ -- For all parameter modes, actuals that denote components and slices of
+ -- packed arrays are expanded into suitable temporaries.
--
-- For non-scalar objects that are possibly unaligned, add call by copy
-- code (copy in for IN and IN OUT, copy out for OUT and IN OUT).
-- reference to the object itself, and the call becomes a call to the
-- corresponding protected subprogram.
+ function Is_Null_Procedure (Subp : Entity_Id) return Boolean;
+ -- Predicate to recognize stubbed procedures and null procedures, which
+ -- can be inlined unconditionally in all cases.
+
----------------------------------------------
-- Add_Access_Actual_To_Build_In_Place_Call --
----------------------------------------------
if not Present (Return_Object) then
Obj_Address := Make_Null (Loc);
+ Set_Parent (Obj_Address, Function_Call);
-- If Return_Object is already an expression of an access type, then use
-- it directly, since it must be an access value denoting the return
elsif Is_Access then
Obj_Address := Return_Object;
+ Set_Parent (Obj_Address, Function_Call);
-- Apply Unrestricted_Access to caller's return object
Make_Attribute_Reference (Loc,
Prefix => Return_Object,
Attribute_Name => Name_Unrestricted_Access);
+
+ Set_Parent (Return_Object, Obj_Address);
+ Set_Parent (Obj_Address, Function_Call);
end if;
Analyze_And_Resolve (Obj_Address, Etype (Obj_Acc_Formal));
Alloc_Form_Formal : Node_Id;
begin
+ -- The allocation form generally doesn't need to be passed in the case
+ -- of a constrained result subtype, since normally the caller performs
+ -- the allocation in that case. However this formal is still needed in
+ -- the case where the function has a tagged result, because generally
+ -- such functions can be called in a dispatching context and such calls
+ -- must be handled like calls to class-wide functions.
+
+ if Is_Constrained (Underlying_Type (Etype (Function_Id)))
+ and then not Is_Tagged_Type (Underlying_Type (Etype (Function_Id)))
+ then
+ return;
+ end if;
+
-- Locate the implicit allocation form parameter in the called function.
-- Maybe it would be better for each implicit formal of a build-in-place
-- function to have a flag or a Uint attribute to identify it. ???
procedure Add_Final_List_Actual_To_Build_In_Place_Call
(Function_Call : Node_Id;
- Function_Id : Entity_Id)
+ Function_Id : Entity_Id;
+ Acc_Type : Entity_Id;
+ Sel_Comp : Node_Id := Empty)
is
Loc : constant Source_Ptr := Sloc (Function_Call);
Final_List : Node_Id;
Final_List_Actual : Node_Id;
Final_List_Formal : Node_Id;
+ Is_Ctrl_Result : constant Boolean :=
+ Needs_Finalization
+ (Underlying_Type (Etype (Function_Id)));
begin
- -- No such extra parameter is needed if there are no controlled parts
-
- if not (Is_Controlled (Etype (Function_Id))
- or else Has_Controlled_Component (Etype (Function_Id))) then
+ -- No such extra parameter is needed if there are no controlled parts.
+ -- The test for Needs_Finalization accounts for class-wide results
+ -- (which potentially have controlled parts, even if the root type
+ -- doesn't), and the test for a tagged result type is needed because
+ -- calls to such a function can in general occur in dispatching
+ -- contexts, which must be treated the same as a call to class-wide
+ -- functions. Both of these situations require that a finalization list
+ -- be passed.
+
+ if not Needs_BIP_Final_List (Function_Id) then
return;
end if;
Final_List_Formal := Build_In_Place_Formal (Function_Id, BIP_Final_List);
- -- Create the actual which is a pointer to the current finalization list
+ -- Create the actual which is a pointer to the appropriate finalization
+ -- list. Acc_Type is present if and only if this call is the
+ -- initialization of an allocator. Use the Current_Scope or the
+ -- Acc_Type as appropriate.
+
+ if Present (Acc_Type)
+ and then (Ekind (Acc_Type) = E_Anonymous_Access_Type
+ or else
+ Present (Associated_Final_Chain (Base_Type (Acc_Type))))
+ then
+ Final_List := Find_Final_List (Acc_Type);
+
+ -- If Sel_Comp is present and the function result is controlled, then
+ -- the finalization list will be obtained from the _controller list of
+ -- the selected component's prefix object.
+
+ elsif Present (Sel_Comp) and then Is_Ctrl_Result then
+ Final_List := Find_Final_List (Current_Scope, Sel_Comp);
+
+ else
+ Final_List := Find_Final_List (Current_Scope);
+ end if;
- Final_List := Find_Final_List (Current_Scope);
Final_List_Actual :=
Make_Attribute_Reference (Loc,
Prefix => Final_List,
declare
Activation_Chain_Actual : Node_Id;
Activation_Chain_Formal : Node_Id;
+
begin
-- Locate implicit activation chain parameter in the called function
-- function to have a flag or a Uint attribute to identify it. ???
loop
+ pragma Assert (Present (Extra_Formal));
exit when
Chars (Extra_Formal) =
New_External_Name (Chars (Func), BIP_Formal_Suffix (Kind));
Next_Formal_With_Extras (Extra_Formal);
end loop;
- pragma Assert (Present (Extra_Formal));
return Extra_Formal;
end Build_In_Place_Formal;
-- Push our current scope for analyzing the declarations and code that
-- we will insert for the checking.
- New_Scope (Spec);
+ Push_Scope (Spec);
-- This loop builds temporary variables for each of the referenced
-- globals, so that at the end of the loop the list Shad_List contains
Low_Bound =>
Make_Attribute_Reference (Loc,
Prefix => New_Occurrence_Of (Var, Loc),
- Attribute_name => Name_First),
+ Attribute_Name => Name_First),
High_Bound =>
Make_Attribute_Reference (Loc,
Prefix => New_Occurrence_Of (Var, Loc),
-- created, since we just passed it as an OUT parameter.
Kill_Current_Values (Temp);
+ Set_Is_Known_Valid (Temp, False);
-- If type conversion, use reverse conversion on exit
Rewrite (Actual, New_Reference_To (Temp, Loc));
Analyze (Actual);
- Append_To (Post_Call,
- Make_Assignment_Statement (Loc,
- Name => New_Occurrence_Of (Var, Loc),
- Expression => Expr));
+ -- If the actual is a conversion of a packed reference, it may
+ -- already have been expanded by Remove_Side_Effects, and the
+ -- resulting variable is a temporary which does not designate
+ -- the proper out-parameter, which may not be addressable. In
+ -- that case, generate an assignment to the original expression
+ -- (before expansion of the packed reference) so that the proper
+ -- expansion of assignment to a packed component can take place.
- Set_Assignment_OK (Name (Last (Post_Call)));
+ declare
+ Obj : Node_Id;
+ Lhs : Node_Id;
+
+ begin
+ if Is_Renaming_Of_Object (Var)
+ and then Nkind (Renamed_Object (Var)) = N_Selected_Component
+ and then Is_Entity_Name (Prefix (Renamed_Object (Var)))
+ and then Nkind (Original_Node (Prefix (Renamed_Object (Var))))
+ = N_Indexed_Component
+ and then
+ Has_Non_Standard_Rep (Etype (Prefix (Renamed_Object (Var))))
+ then
+ Obj := Renamed_Object (Var);
+ Lhs :=
+ Make_Selected_Component (Loc,
+ Prefix =>
+ New_Copy_Tree (Original_Node (Prefix (Obj))),
+ Selector_Name => New_Copy (Selector_Name (Obj)));
+ Reset_Analyzed_Flags (Lhs);
+
+ else
+ Lhs := New_Occurrence_Of (Var, Loc);
+ end if;
+
+ Set_Assignment_OK (Lhs);
+
+ Append_To (Post_Call,
+ Make_Assignment_Statement (Loc,
+ Name => Lhs,
+ Expression => Expr));
+ end;
end if;
end Add_Call_By_Copy_Code;
return False;
-- For users of Starlet, we assume that the specification of by-
- -- reference mechanism is mandatory. This may lead to unligned
+ -- reference mechanism is mandatory. This may lead to unaligned
-- objects but at least for DEC legacy code it is known to work.
-- The warning will alert users of this code that a problem may
-- be lurking.
begin
loop
Set_Analyzed (Pfx, False);
- exit when Nkind (Pfx) /= N_Selected_Component
- and then Nkind (Pfx) /= N_Indexed_Component;
+ exit when
+ not Nkind_In (Pfx, N_Selected_Component, N_Indexed_Component);
Pfx := Prefix (Pfx);
end loop;
end Reset_Packed_Prefix;
elsif Is_Possibly_Unaligned_Slice (Actual) then
Add_Call_By_Copy_Code;
- -- Deal with access types where the actual subtpe and the
+ -- Deal with access types where the actual subtype and the
-- formal subtype are not the same, requiring a check.
-- It is necessary to exclude tagged types because of "downward
- -- conversion" errors and a strange assertion error in namet
- -- from gnatf in bug 1215-001 ???
+ -- conversion" errors.
elsif Is_Access_Type (E_Formal)
and then not Same_Type (E_Formal, Etype (Actual))
-- treatment, whereas the formal is not volatile, then pass
-- by copy unless it is a by-reference type.
+ -- Note: we use Is_Volatile here rather than Treat_As_Volatile,
+ -- because this is the enforcement of a language rule that applies
+ -- only to "real" volatile variables, not e.g. to the address
+ -- clause overlay case.
+
elsif Is_Entity_Name (Actual)
- and then Treat_As_Volatile (Entity (Actual))
+ and then Is_Volatile (Entity (Actual))
and then not Is_By_Reference_Type (Etype (Actual))
and then not Is_Scalar_Type (Etype (Entity (Actual)))
- and then not Treat_As_Volatile (E_Formal)
+ and then not Is_Volatile (E_Formal)
then
Add_Call_By_Copy_Code;
and then Has_Volatile_Components (Entity (Prefix (Actual)))
then
Add_Call_By_Copy_Code;
+
+ -- Add call-by-copy code for the case of scalar out parameters
+ -- when it is not known at compile time that the subtype of the
+ -- formal is a subrange of the subtype of the actual (or vice
+ -- versa for in out parameters), in order to get range checks
+ -- on such actuals. (Maybe this case should be handled earlier
+ -- in the if statement???)
+
+ elsif Is_Scalar_Type (E_Formal)
+ and then
+ (not In_Subrange_Of (E_Formal, Etype (Actual))
+ or else
+ (Ekind (Formal) = E_In_Out_Parameter
+ and then not In_Subrange_Of (Etype (Actual), E_Formal)))
+ then
+ -- Perhaps the setting back to False should be done within
+ -- Add_Call_By_Copy_Code, since it could get set on other
+ -- cases occurring above???
+
+ if Do_Range_Check (Actual) then
+ Set_Do_Range_Check (Actual, False);
+ end if;
+
+ Add_Call_By_Copy_Code;
end if;
-- Processing for IN parameters
Reset_Packed_Prefix;
Expand_Packed_Element_Reference (Actual);
- -- If we have a reference to a bit packed array, we copy it,
- -- since the actual must be byte aligned.
+ -- If we have a reference to a bit packed array, we copy it, since
+ -- the actual must be byte aligned.
-- Is this really necessary in all cases???
P : constant Node_Id := Parent (N);
begin
- pragma Assert (Nkind (P) = N_Triggering_Alternative
- or else Nkind (P) = N_Entry_Call_Alternative);
+ pragma Assert (Nkind_In (P, N_Triggering_Alternative,
+ N_Entry_Call_Alternative));
if Is_Non_Empty_List (Statements (P)) then
Insert_List_Before_And_Analyze
-- This procedure handles expansion of function calls and procedure call
-- statements (i.e. it serves as the body for Expand_N_Function_Call and
- -- Expand_N_Procedure_Call_Statement. Processing for calls includes:
+ -- Expand_N_Procedure_Call_Statement). Processing for calls includes:
- -- Replace call to Raise_Exception by Raise_Exception always if possible
+ -- Replace call to Raise_Exception by Raise_Exception_Always if possible
-- Provide values of actuals for all formals in Extra_Formals list
-- Replace "call" to enumeration literal function by literal itself
-- Rewrite call to predefined operator as operator
procedure Expand_Call (N : Node_Id) is
Loc : constant Source_Ptr := Sloc (N);
- Remote : constant Boolean := Is_Remote_Call (N);
- Subp : Entity_Id;
- Orig_Subp : Entity_Id := Empty;
- Parent_Subp : Entity_Id;
- Parent_Formal : Entity_Id;
- Actual : Node_Id;
- Formal : Entity_Id;
- Prev : Node_Id := Empty;
-
- Prev_Orig : Node_Id;
- -- Original node for an actual, which may have been rewritten. If the
- -- actual is a function call that has been transformed from a selected
- -- component, the original node is unanalyzed. Otherwise, it carries
- -- semantic information used to generate additional actuals.
-
- Scop : Entity_Id;
Extra_Actuals : List_Id := No_List;
-
- CW_Interface_Formals_Present : Boolean := False;
+ Prev : Node_Id := Empty;
procedure Add_Actual_Parameter (Insert_Param : Node_Id);
-- Adds one entry to the end of the actual parameter list. Used for
function Inherited_From_Formal (S : Entity_Id) return Entity_Id;
-- Within an instance, a type derived from a non-tagged formal derived
- -- type inherits from the original parent, not from the actual. This is
- -- tested in 4723-003. The current derivation mechanism has the derived
- -- type inherit from the actual, which is only correct outside of the
- -- instance. If the subprogram is inherited, we test for this particular
- -- case through a convoluted tree traversal before setting the proper
- -- subprogram to be called.
+ -- type inherits from the original parent, not from the actual. The
+ -- current derivation mechanism has the derived type inherit from the
+ -- actual, which is only correct outside of the instance. If the
+ -- subprogram is inherited, we test for this particular case through a
+ -- convoluted tree traversal before setting the proper subprogram to be
+ -- called.
--------------------------
-- Add_Actual_Parameter --
Make_Identifier (Loc, Chars (EF))));
Analyze_And_Resolve (Expr, Etype (EF));
+
+ if Nkind (N) = N_Function_Call then
+ Set_Is_Accessibility_Actual (Parent (Expr));
+ end if;
end Add_Extra_Actual;
---------------------------
else
Indic :=
- (Subtype_Indication
- (Type_Definition (Original_Node (Parent (S)))));
+ Subtype_Indication
+ (Type_Definition (Original_Node (Parent (S))));
if Nkind (Indic) = N_Subtype_Indication then
Par := Entity (Subtype_Mark (Indic));
or else not In_Open_Scopes (Scope (Par))
then
return Empty;
-
else
Gen_Par := Generic_Parent_Type (Parent (Par));
end if;
+ -- If the actual has no generic parent type, the formal is not
+ -- a formal derived type, so nothing to inherit.
+
+ if No (Gen_Par) then
+ return Empty;
+ end if;
+
-- If the generic parent type is still the generic type, this is a
-- private formal, not a derived formal, and there are no operations
-- inherited from the formal.
raise Program_Error;
end Inherited_From_Formal;
+ -- Local variables
+
+ Remote : constant Boolean := Is_Remote_Call (N);
+ Actual : Node_Id;
+ Formal : Entity_Id;
+ Orig_Subp : Entity_Id := Empty;
+ Param_Count : Natural := 0;
+ Parent_Formal : Entity_Id;
+ Parent_Subp : Entity_Id;
+ Scop : Entity_Id;
+ Subp : Entity_Id;
+
+ Prev_Orig : Node_Id;
+ -- Original node for an actual, which may have been rewritten. If the
+ -- actual is a function call that has been transformed from a selected
+ -- component, the original node is unanalyzed. Otherwise, it carries
+ -- semantic information used to generate additional actuals.
+
+ CW_Interface_Formals_Present : Boolean := False;
+
-- Start of processing for Expand_Call
begin
-- Replace call to Raise_Exception by call to Raise_Exception_Always
-- if we can tell that the first parameter cannot possibly be null.
- -- This helps optimization and also generation of warnings.
+ -- This improves efficiency by avoiding a run-time test.
- if not Restriction_Active (No_Exception_Handlers)
- and then Is_RTE (Subp, RE_Raise_Exception)
+ -- We do not do this if Raise_Exception_Always does not exist, which
+ -- can happen in configurable run time profiles which provide only a
+ -- Raise_Exception.
+
+ if Is_RTE (Subp, RE_Raise_Exception)
+ and then RTE_Available (RE_Raise_Exception_Always)
then
declare
FA : constant Node_Id := Original_Node (First_Actual (N));
and then Attribute_Name (FA) = Name_Identity
then
Subp := RTE (RE_Raise_Exception_Always);
- Set_Entity (Name (N), Subp);
+ Set_Name (N, New_Occurrence_Of (Subp, Loc));
end if;
end;
end if;
end;
end if;
- -- First step, compute extra actuals, corresponding to any
- -- Extra_Formals present. Note that we do not access Extra_Formals
- -- directly, instead we simply note the presence of the extra
- -- formals as we process the regular formals and collect the
- -- corresponding actuals in Extra_Actuals.
+ -- First step, compute extra actuals, corresponding to any Extra_Formals
+ -- present. Note that we do not access Extra_Formals directly, instead
+ -- we simply note the presence of the extra formals as we process the
+ -- regular formals collecting corresponding actuals in Extra_Actuals.
- -- We also generate any required range checks for actuals as we go
- -- through the loop, since this is a convenient place to do this.
+ -- We also generate any required range checks for actuals for in formals
+ -- as we go through the loop, since this is a convenient place to do it.
+ -- (Though it seems that this would be better done in Expand_Actuals???)
- Formal := First_Formal (Subp);
- Actual := First_Actual (N);
+ Formal := First_Formal (Subp);
+ Actual := First_Actual (N);
+ Param_Count := 1;
while Present (Formal) loop
- -- Generate range check if required (not activated yet ???)
+ -- Generate range check if required
--- if Do_Range_Check (Actual) then
--- Set_Do_Range_Check (Actual, False);
--- Generate_Range_Check
--- (Actual, Etype (Formal), CE_Range_Check_Failed);
--- end if;
+ if Do_Range_Check (Actual)
+ and then Ekind (Formal) = E_In_Parameter
+ then
+ Set_Do_Range_Check (Actual, False);
+ Generate_Range_Check
+ (Actual, Etype (Formal), CE_Range_Check_Failed);
+ end if;
-- Prepare to examine current entry
Prev := Actual;
Prev_Orig := Original_Node (Prev);
- if not Analyzed (Prev_Orig)
- and then Nkind (Actual) = N_Function_Call
- then
- Prev_Orig := Prev;
- end if;
-
-- Ada 2005 (AI-251): Check if any formal is a class-wide interface
-- to expand it in a further round.
if Ekind (Etype (Prev)) in Private_Kind
and then not Has_Discriminants (Base_Type (Etype (Prev)))
then
- Add_Extra_Actual (
- New_Occurrence_Of (Standard_False, Loc),
- Extra_Constrained (Formal));
+ Add_Extra_Actual
+ (New_Occurrence_Of (Standard_False, Loc),
+ Extra_Constrained (Formal));
elsif Is_Constrained (Etype (Formal))
or else not Has_Discriminants (Etype (Prev))
then
- Add_Extra_Actual (
- New_Occurrence_Of (Standard_True, Loc),
- Extra_Constrained (Formal));
+ Add_Extra_Actual
+ (New_Occurrence_Of (Standard_True, Loc),
+ Extra_Constrained (Formal));
-- Do not produce extra actuals for Unchecked_Union parameters.
-- Jump directly to the end of the loop.
-- as out parameter actuals on calls to stream procedures.
Act_Prev := Prev;
- while Nkind (Act_Prev) = N_Type_Conversion
- or else Nkind (Act_Prev) = N_Unchecked_Type_Conversion
+ while Nkind_In (Act_Prev, N_Type_Conversion,
+ N_Unchecked_Type_Conversion)
loop
Act_Prev := Expression (Act_Prev);
end loop;
- -- If the expression is a conversion of a dereference,
- -- this is internally generated code that manipulates
- -- addresses, e.g. when building interface tables. No
- -- check should occur in this case, and the discriminated
- -- object is not directly a hand.
+ -- If the expression is a conversion of a dereference, this
+ -- is internally generated code that manipulates addresses,
+ -- e.g. when building interface tables. No check should
+ -- occur in this case, and the discriminated object is not
+ -- directly a hand.
if not Comes_From_Source (Actual)
and then Nkind (Actual) = N_Unchecked_Type_Conversion
-- Create possible extra actual for accessibility level
if Present (Extra_Accessibility (Formal)) then
- if Is_Entity_Name (Prev_Orig) then
- -- When passing an access parameter as the actual to another
- -- access parameter we need to pass along the actual's own
- -- associated access level parameter. This is done if we are
- -- in the scope of the formal access parameter (if this is an
- -- inlined body the extra formal is irrelevant).
+ -- Ada 2005 (AI-252): If the actual was rewritten as an Access
+ -- attribute, then the original actual may be an aliased object
+ -- occurring as the prefix in a call using "Object.Operation"
+ -- notation. In that case we must pass the level of the object,
+ -- so Prev_Orig is reset to Prev and the attribute will be
+ -- processed by the code for Access attributes further below.
+
+ if Prev_Orig /= Prev
+ and then Nkind (Prev) = N_Attribute_Reference
+ and then
+ Get_Attribute_Id (Attribute_Name (Prev)) = Attribute_Access
+ and then Is_Aliased_View (Prev_Orig)
+ then
+ Prev_Orig := Prev;
+ end if;
+
+ -- Ada 2005 (AI-251): Thunks must propagate the extra actuals
+ -- of accessibility levels.
+
+ if Ekind (Current_Scope) in Subprogram_Kind
+ and then Is_Thunk (Current_Scope)
+ then
+ declare
+ Parm_Ent : Entity_Id;
+
+ begin
+ if Is_Controlling_Actual (Actual) then
+
+ -- Find the corresponding actual of the thunk
+
+ Parm_Ent := First_Entity (Current_Scope);
+ for J in 2 .. Param_Count loop
+ Next_Entity (Parm_Ent);
+ end loop;
+
+ else pragma Assert (Is_Entity_Name (Actual));
+ Parm_Ent := Entity (Actual);
+ end if;
+
+ Add_Extra_Actual
+ (New_Occurrence_Of (Extra_Accessibility (Parm_Ent), Loc),
+ Extra_Accessibility (Formal));
+ end;
- if Ekind (Entity (Prev_Orig)) in Formal_Kind
+ elsif Is_Entity_Name (Prev_Orig) then
+
+ -- When passing an access parameter, or a renaming of an access
+ -- parameter, as the actual to another access parameter we need
+ -- to pass along the actual's own access level parameter. This
+ -- is done if we are within the scope of the formal access
+ -- parameter (if this is an inlined body the extra formal is
+ -- irrelevant).
+
+ if (Is_Formal (Entity (Prev_Orig))
+ or else
+ (Present (Renamed_Object (Entity (Prev_Orig)))
+ and then
+ Is_Entity_Name (Renamed_Object (Entity (Prev_Orig)))
+ and then
+ Is_Formal
+ (Entity (Renamed_Object (Entity (Prev_Orig))))))
and then Ekind (Etype (Prev_Orig)) = E_Anonymous_Access_Type
and then In_Open_Scopes (Scope (Entity (Prev_Orig)))
then
else
Add_Extra_Actual
(Make_Integer_Literal (Loc,
- Intval => Scope_Depth (Standard_Standard)),
+ Intval => Scope_Depth (Standard_Standard)),
Extra_Accessibility (Formal));
end if;
end;
- -- The actual is a normal access value, so just pass the
- -- level of the actual's access type.
+ -- The actual is a normal access value, so just pass the level
+ -- of the actual's access type.
else
Add_Extra_Actual
(Make_Integer_Literal (Loc,
- Intval => Type_Access_Level (Etype (Prev_Orig))),
+ Intval => Type_Access_Level (Etype (Prev_Orig))),
Extra_Accessibility (Formal));
end if;
+ -- If the actual is an access discriminant, then pass the level
+ -- of the enclosing object (RM05-3.10.2(12.4/2)).
+
+ elsif Nkind (Prev_Orig) = N_Selected_Component
+ and then Ekind (Entity (Selector_Name (Prev_Orig))) =
+ E_Discriminant
+ and then Ekind (Etype (Entity (Selector_Name (Prev_Orig)))) =
+ E_Anonymous_Access_Type
+ then
+ Add_Extra_Actual
+ (Make_Integer_Literal (Loc,
+ Intval => Object_Access_Level (Prefix (Prev_Orig))),
+ Extra_Accessibility (Formal));
+
+ -- All other cases
+
else
case Nkind (Prev_Orig) is
when N_Attribute_Reference =>
-
case Get_Attribute_Id (Attribute_Name (Prev_Orig)) is
-- For X'Access, pass on the level of the prefix X
when Attribute_Access =>
- Add_Extra_Actual (
- Make_Integer_Literal (Loc,
+ Add_Extra_Actual
+ (Make_Integer_Literal (Loc,
Intval =>
- Object_Access_Level (Prefix (Prev_Orig))),
- Extra_Accessibility (Formal));
+ Object_Access_Level
+ (Prefix (Prev_Orig))),
+ Extra_Accessibility (Formal));
-- Treat the unchecked attributes as library-level
when Attribute_Unchecked_Access |
Attribute_Unrestricted_Access =>
- Add_Extra_Actual (
- Make_Integer_Literal (Loc,
- Intval => Scope_Depth (Standard_Standard)),
- Extra_Accessibility (Formal));
+ Add_Extra_Actual
+ (Make_Integer_Literal (Loc,
+ Intval => Scope_Depth (Standard_Standard)),
+ Extra_Accessibility (Formal));
-- No other cases of attributes returning access
-- values that can be passed to access parameters
end case;
- -- For allocators we pass the level of the execution of
- -- the called subprogram, which is one greater than the
- -- current scope level.
+ -- For allocators we pass the level of the execution of the
+ -- called subprogram, which is one greater than the current
+ -- scope level.
when N_Allocator =>
- Add_Extra_Actual (
- Make_Integer_Literal (Loc,
- Scope_Depth (Current_Scope) + 1),
- Extra_Accessibility (Formal));
+ Add_Extra_Actual
+ (Make_Integer_Literal (Loc,
+ Intval => Scope_Depth (Current_Scope) + 1),
+ Extra_Accessibility (Formal));
- -- For other cases we simply pass the level of the
- -- actual's access type.
+ -- For other cases we simply pass the level of the actual's
+ -- access type. The type is retrieved from Prev rather than
+ -- Prev_Orig, because in some cases Prev_Orig denotes an
+ -- original expression that has not been analyzed.
when others =>
- Add_Extra_Actual (
- Make_Integer_Literal (Loc,
- Intval => Type_Access_Level (Etype (Prev_Orig))),
- Extra_Accessibility (Formal));
-
+ Add_Extra_Actual
+ (Make_Integer_Literal (Loc,
+ Intval => Type_Access_Level (Etype (Prev))),
+ Extra_Accessibility (Formal));
end case;
end if;
end if;
if Is_Access_Type (Etype (Formal))
and then Can_Never_Be_Null (Etype (Formal))
and then Nkind (Prev) /= N_Raise_Constraint_Error
- and then (Nkind (Prev) = N_Null
+ and then (Known_Null (Prev)
or else not Can_Never_Be_Null (Etype (Prev)))
then
Install_Null_Excluding_Check (Prev);
then
null;
- elsif Nkind (Prev) = N_Allocator
- or else Nkind (Prev) = N_Attribute_Reference
- then
+ elsif Nkind_In (Prev, N_Allocator, N_Attribute_Reference) then
null;
-- Suppress null checks when passing to access parameters of Java
- -- subprograms. (Should this be done for other foreign conventions
- -- as well ???)
+ -- and CIL subprograms. (Should this be done for other foreign
+ -- conventions as well ???)
- elsif Convention (Subp) = Convention_Java then
+ elsif Convention (Subp) = Convention_Java
+ or else Convention (Subp) = Convention_CIL
+ then
null;
else
(Ekind (Formal) = E_In_Out_Parameter
and then Validity_Check_In_Out_Params)
then
- -- If the actual is an indexed component of a packed
- -- type, it has not been expanded yet. It will be
- -- copied in the validity code that follows, and has
- -- to be expanded appropriately, so reanalyze it.
+ -- If the actual is an indexed component of a packed type (or
+ -- is an indexed or selected component whose prefix recursively
+ -- meets this condition), it has not been expanded yet. It will
+ -- be copied in the validity code that follows, and has to be
+ -- expanded appropriately, so reanalyze it.
- if Nkind (Actual) = N_Indexed_Component then
- Set_Analyzed (Actual, False);
- end if;
+ -- What we do is just to unset analyzed bits on prefixes till
+ -- we reach something that does not have a prefix.
+
+ declare
+ Nod : Node_Id;
+
+ begin
+ Nod := Actual;
+ while Nkind_In (Nod, N_Indexed_Component,
+ N_Selected_Component)
+ loop
+ Set_Analyzed (Nod, False);
+ Nod := Prefix (Nod);
+ end loop;
+ end;
Ensure_Valid (Actual);
end if;
if Ekind (Formal) /= E_In_Parameter
and then Is_Entity_Name (Actual)
+ and then Present (Entity (Actual))
then
- Kill_Current_Values (Entity (Actual));
+ declare
+ Ent : constant Entity_Id := Entity (Actual);
+ Sav : Node_Id;
+
+ begin
+ -- For an OUT or IN OUT parameter that is an assignable entity,
+ -- we do not want to clobber the Last_Assignment field, since
+ -- if it is set, it was precisely because it is indeed an OUT
+ -- or IN OUT parameter! We do reset the Is_Known_Valid flag
+ -- since the subprogram could have returned in invalid value.
+
+ if (Ekind (Formal) = E_Out_Parameter
+ or else
+ Ekind (Formal) = E_In_Out_Parameter)
+ and then Is_Assignable (Ent)
+ then
+ Sav := Last_Assignment (Ent);
+ Kill_Current_Values (Ent);
+ Set_Last_Assignment (Ent, Sav);
+ Set_Is_Known_Valid (Ent, False);
+
+ -- For all other cases, just kill the current values
+
+ else
+ Kill_Current_Values (Ent);
+ end if;
+ end;
end if;
-- If the formal is class wide and the actual is an aggregate, force
-- In a remote call, if the formal is of a class-wide type, check
-- that the actual meets the requirements described in E.4(18).
- if Remote
- and then Is_Class_Wide_Type (Etype (Formal))
- then
+ if Remote and then Is_Class_Wide_Type (Etype (Formal)) then
Insert_Action (Actual,
- Make_Implicit_If_Statement (N,
- Condition =>
- Make_Op_Not (Loc,
- Build_Get_Remotely_Callable (Loc,
- Make_Selected_Component (Loc,
- Prefix => Duplicate_Subexpr_Move_Checks (Actual),
- Selector_Name =>
- Make_Identifier (Loc, Name_uTag)))),
- Then_Statements => New_List (
- Make_Raise_Program_Error (Loc,
- Reason => PE_Illegal_RACW_E_4_18))));
+ Make_Transportable_Check (Loc,
+ Duplicate_Subexpr_Move_Checks (Actual)));
end if;
-- This label is required when skipping extra actual generation for
<<Skip_Extra_Actual_Generation>>
+ Param_Count := Param_Count + 1;
Next_Actual (Actual);
Next_Formal (Formal);
end loop;
then
Error_Msg_NE
("tag-indeterminate expression "
- & " must have designated type& ('R'M 5.2 (6))",
+ & " must have designated type& (RM 5.2 (6))",
N, Root_Type (Etype (Name (Ass))));
else
Propagate_Tag (Name (Ass), N);
elsif Etype (N) /= Root_Type (Etype (Name (Ass))) then
Error_Msg_NE
("tag-indeterminate expression must have type&"
- & "('R'M 5.2 (6))", N, Root_Type (Etype (Name (Ass))));
+ & "(RM 5.2 (6))", N, Root_Type (Etype (Name (Ass))));
else
Propagate_Tag (Name (Ass), N);
-- Ada 2005 (AI-251): If some formal is a class-wide interface, expand
-- it to point to the correct secondary virtual table
- if (Nkind (N) = N_Function_Call
- or else Nkind (N) = N_Procedure_Call_Statement)
+ if Nkind_In (N, N_Function_Call, N_Procedure_Call_Statement)
and then CW_Interface_Formals_Present
then
Expand_Interface_Actuals (N);
-- extra actuals since this will be done on the re-analysis of the
-- dispatching call. Note that we do not try to shorten the actual
-- list for a dispatching call, it would not make sense to do so.
- -- Expansion of dispatching calls is suppressed when Java_VM, because
- -- the JVM back end directly handles the generation of dispatching
+ -- Expansion of dispatching calls is suppressed when VM_Target, because
+ -- the VM back-ends directly handle the generation of dispatching
-- calls and would have to undo any expansion to an indirect call.
- if (Nkind (N) = N_Function_Call
- or else Nkind (N) = N_Procedure_Call_Statement)
+ if Nkind_In (N, N_Function_Call, N_Procedure_Call_Statement)
and then Present (Controlling_Argument (N))
- and then not Java_VM
then
- Expand_Dispatching_Call (N);
+ if Tagged_Type_Expansion then
+ Expand_Dispatching_Call (N);
- -- The following return is worrisome. Is it really OK to
- -- skip all remaining processing in this procedure ???
+ -- The following return is worrisome. Is it really OK to
+ -- skip all remaining processing in this procedure ???
- return;
+ return;
+
+ else
+ Apply_Tag_Checks (N);
+
+ -- Expansion of a dispatching call results in an indirect call,
+ -- which in turn causes current values to be killed (see
+ -- Resolve_Call), so on VM targets we do the call here to ensure
+ -- consistent warnings between VM and non-VM targets.
+
+ Kill_Current_Values;
+ end if;
+ end if;
-- Similarly, expand calls to RCI subprograms on which pragma
-- All_Calls_Remote applies. The rewriting will be reanalyzed
-- later. Do this only when the call comes from source since we do
- -- not want such a rewritting to occur in expanded code.
+ -- not want such a rewriting to occur in expanded code.
- elsif Is_All_Remote_Call (N) then
+ if Is_All_Remote_Call (N) then
Expand_All_Calls_Remote_Subprogram_Call (N);
-- Similarly, do not add extra actuals for an entry call whose entity
("cannot call abstract subprogram &!", Name (N), Parent_Subp);
end if;
- -- Add an explicit conversion for parameter of the derived type.
- -- This is only done for scalar and access in-parameters. Others
- -- have been expanded in expand_actuals.
-
- Formal := First_Formal (Subp);
- Parent_Formal := First_Formal (Parent_Subp);
- Actual := First_Actual (N);
+ -- Inspect all formals of derived subprogram Subp. Compare parameter
+ -- types with the parent subprogram and check whether an actual may
+ -- need a type conversion to the corresponding formal of the parent
+ -- subprogram.
- -- It is not clear that conversion is needed for intrinsic
- -- subprograms, but it certainly is for those that are user-
- -- defined, and that can be inherited on derivation, namely
- -- unchecked conversion and deallocation.
- -- General case needs study ???
+ -- Not clear whether intrinsic subprograms need such conversions. ???
if not Is_Intrinsic_Subprogram (Parent_Subp)
or else Is_Generic_Instance (Parent_Subp)
then
- while Present (Formal) loop
- if Etype (Formal) /= Etype (Parent_Formal)
- and then Is_Scalar_Type (Etype (Formal))
- and then Ekind (Formal) = E_In_Parameter
- and then
- not Subtypes_Statically_Match
- (Etype (Parent_Formal), Etype (Actual))
- and then not Raises_Constraint_Error (Actual)
- then
- Rewrite (Actual,
- OK_Convert_To (Etype (Parent_Formal),
- Relocate_Node (Actual)));
+ declare
+ procedure Convert (Act : Node_Id; Typ : Entity_Id);
+ -- Rewrite node Act as a type conversion of Act to Typ. Analyze
+ -- and resolve the newly generated construct.
- Analyze (Actual);
- Resolve (Actual, Etype (Parent_Formal));
- Enable_Range_Check (Actual);
+ -------------
+ -- Convert --
+ -------------
- elsif Is_Access_Type (Etype (Formal))
- and then Base_Type (Etype (Parent_Formal)) /=
- Base_Type (Etype (Actual))
- then
- if Ekind (Formal) /= E_In_Parameter then
- Rewrite (Actual,
- Convert_To (Etype (Parent_Formal),
- Relocate_Node (Actual)));
-
- Analyze (Actual);
- Resolve (Actual, Etype (Parent_Formal));
-
- elsif
- Ekind (Etype (Parent_Formal)) = E_Anonymous_Access_Type
- and then Designated_Type (Etype (Parent_Formal))
- /=
- Designated_Type (Etype (Actual))
- and then not Is_Controlling_Formal (Formal)
+ procedure Convert (Act : Node_Id; Typ : Entity_Id) is
+ begin
+ Rewrite (Act, OK_Convert_To (Typ, Relocate_Node (Act)));
+ Analyze (Act);
+ Resolve (Act, Typ);
+ end Convert;
+
+ -- Local variables
+
+ Actual_Typ : Entity_Id;
+ Formal_Typ : Entity_Id;
+ Parent_Typ : Entity_Id;
+
+ begin
+ Actual := First_Actual (N);
+ Formal := First_Formal (Subp);
+ Parent_Formal := First_Formal (Parent_Subp);
+ while Present (Formal) loop
+ Actual_Typ := Etype (Actual);
+ Formal_Typ := Etype (Formal);
+ Parent_Typ := Etype (Parent_Formal);
+
+ -- For an IN parameter of a scalar type, the parent formal
+ -- type and derived formal type differ or the parent formal
+ -- type and actual type do not match statically.
+
+ if Is_Scalar_Type (Formal_Typ)
+ and then Ekind (Formal) = E_In_Parameter
+ and then Formal_Typ /= Parent_Typ
+ and then
+ not Subtypes_Statically_Match (Parent_Typ, Actual_Typ)
+ and then not Raises_Constraint_Error (Actual)
+ then
+ Convert (Actual, Parent_Typ);
+ Enable_Range_Check (Actual);
+
+ -- If the actual has been marked as requiring a range
+ -- check, then generate it here.
+
+ if Do_Range_Check (Actual) then
+ Set_Do_Range_Check (Actual, False);
+ Generate_Range_Check
+ (Actual, Etype (Formal), CE_Range_Check_Failed);
+ end if;
+
+ -- For access types, the parent formal type and actual type
+ -- differ.
+
+ elsif Is_Access_Type (Formal_Typ)
+ and then Base_Type (Parent_Typ) /= Base_Type (Actual_Typ)
then
- -- This unchecked conversion is not necessary unless
- -- inlining is enabled, because in that case the type
- -- mismatch may become visible in the body about to be
- -- inlined.
+ if Ekind (Formal) /= E_In_Parameter then
+ Convert (Actual, Parent_Typ);
+
+ elsif Ekind (Parent_Typ) = E_Anonymous_Access_Type
+ and then Designated_Type (Parent_Typ) /=
+ Designated_Type (Actual_Typ)
+ and then not Is_Controlling_Formal (Formal)
+ then
+ -- This unchecked conversion is not necessary unless
+ -- inlining is enabled, because in that case the type
+ -- mismatch may become visible in the body about to be
+ -- inlined.
+
+ Rewrite (Actual,
+ Unchecked_Convert_To (Parent_Typ,
+ Relocate_Node (Actual)));
+
+ -- If the relocated node is a function call then it
+ -- can be part of the expansion of the predefined
+ -- equality operator of a tagged type and we may
+ -- need to adjust its SCIL dispatching node.
+
+ if Generate_SCIL
+ and then Nkind (Actual) /= N_Null
+ and then Nkind (Expression (Actual))
+ = N_Function_Call
+ then
+ Adjust_SCIL_Node (Actual, Expression (Actual));
+ end if;
+
+ Analyze (Actual);
+ Resolve (Actual, Parent_Typ);
+ end if;
- Rewrite (Actual,
- Unchecked_Convert_To (Etype (Parent_Formal),
- Relocate_Node (Actual)));
+ -- For array and record types, the parent formal type and
+ -- derived formal type have different sizes or pragma Pack
+ -- status.
- Analyze (Actual);
- Resolve (Actual, Etype (Parent_Formal));
+ elsif ((Is_Array_Type (Formal_Typ)
+ and then Is_Array_Type (Parent_Typ))
+ or else
+ (Is_Record_Type (Formal_Typ)
+ and then Is_Record_Type (Parent_Typ)))
+ and then
+ (Esize (Formal_Typ) /= Esize (Parent_Typ)
+ or else Has_Pragma_Pack (Formal_Typ) /=
+ Has_Pragma_Pack (Parent_Typ))
+ then
+ Convert (Actual, Parent_Typ);
end if;
- end if;
- Next_Formal (Formal);
- Next_Formal (Parent_Formal);
- Next_Actual (Actual);
- end loop;
+ Next_Actual (Actual);
+ Next_Formal (Formal);
+ Next_Formal (Parent_Formal);
+ end loop;
+ end;
end if;
Orig_Subp := Subp;
-- Handle case of access to protected subprogram type
if Is_Access_Protected_Subprogram_Type
- (Base_Type (Etype (Prefix (Name (N)))))
+ (Base_Type (Etype (Prefix (Name (N)))))
then
-- If this is a call through an access to protected operation,
-- the prefix has the form (object'address, operation'access).
-- In the case where the intrinsic is to be processed by the back end,
-- the call to Expand_Intrinsic_Call will do nothing, which is fine,
-- since the idea in this case is to pass the call unchanged.
+ -- If the intrinsic is an inherited unchecked conversion, and the
+ -- derived type is the target type of the conversion, we must retain
+ -- it as the return type of the expression. Otherwise the expansion
+ -- below, which uses the parent operation, will yield the wrong type.
if Is_Intrinsic_Subprogram (Subp) then
Expand_Intrinsic_Call (N, Subp);
+
+ if Nkind (N) = N_Unchecked_Type_Conversion
+ and then Parent_Subp /= Orig_Subp
+ and then Etype (Parent_Subp) /= Etype (Orig_Subp)
+ then
+ Set_Etype (N, Etype (Orig_Subp));
+ end if;
+
return;
end if;
if Ekind (Subp) = E_Function
or else Ekind (Subp) = E_Procedure
then
+ -- We perform two simple optimization on calls:
+
+ -- a) replace calls to null procedures unconditionally;
+
+ -- b) for To_Address, just do an unchecked conversion. Not only is
+ -- this efficient, but it also avoids order of elaboration problems
+ -- when address clauses are inlined (address expression elaborated
+ -- at the wrong point).
+
+ -- We perform these optimization regardless of whether we are in the
+ -- main unit or in a unit in the context of the main unit, to ensure
+ -- that tree generated is the same in both cases, for Inspector use.
+
+ if Is_RTE (Subp, RE_To_Address) then
+ Rewrite (N,
+ Unchecked_Convert_To
+ (RTE (RE_Address), Relocate_Node (First_Actual (N))));
+ return;
+
+ elsif Is_Null_Procedure (Subp) then
+ Rewrite (N, Make_Null_Statement (Loc));
+ return;
+ end if;
+
if Is_Inlined (Subp) then
Inlined_Subprogram : declare
Scop : constant Entity_Id := Scope (Subp);
function In_Unfrozen_Instance return Boolean;
- -- If the subprogram comes from an instance in the same
- -- unit, and the instance is not yet frozen, inlining might
- -- trigger order-of-elaboration problems in gigi.
+ -- If the subprogram comes from an instance in the same unit,
+ -- and the instance is not yet frozen, inlining might trigger
+ -- order-of-elaboration problems in gigi.
--------------------------
-- In_Unfrozen_Instance --
then
Must_Inline := False;
- -- If this an inherited function that returns a private
- -- type, do not inline if the full view is an unconstrained
- -- array, because such calls cannot be inlined.
+ -- If this an inherited function that returns a private type,
+ -- do not inline if the full view is an unconstrained array,
+ -- because such calls cannot be inlined.
elsif Present (Orig_Subp)
and then Is_Array_Type (Etype (Orig_Subp))
if (In_Extended_Main_Code_Unit (N)
or else In_Extended_Main_Code_Unit (Parent (N))
- or else Is_Always_Inlined (Subp))
+ or else Has_Pragma_Inline_Always (Subp))
and then (not In_Same_Extended_Unit (Sloc (Bod), Loc)
or else
Earlier_In_Extended_Unit (Sloc (Bod), Loc))
and then In_Same_Extended_Unit (Sloc (Spec), Loc)
then
Cannot_Inline
- ("cannot inline& (body not seen yet)?",
- N, Subp);
+ ("cannot inline& (body not seen yet)?", N, Subp);
end if;
end if;
end Inlined_Subprogram;
end if;
end if;
- -- Check for a protected subprogram. This is either an intra-object
- -- call, or a protected function call. Protected procedure calls are
- -- rewritten as entry calls and handled accordingly.
+ -- Check for protected subprogram. This is either an intra-object call,
+ -- or a protected function call. Protected procedure calls are rewritten
+ -- as entry calls and handled accordingly.
- -- In Ada 2005, this may be an indirect call to an access parameter
- -- that is an access_to_subprogram. In that case the anonymous type
- -- has a scope that is a protected operation, but the call is a
- -- regular one.
+ -- In Ada 2005, this may be an indirect call to an access parameter that
+ -- is an access_to_subprogram. In that case the anonymous type has a
+ -- scope that is a protected operation, but the call is a regular one.
Scop := Scope (Subp);
and then Is_Protected_Type (Scop)
and then Ekind (Subp) /= E_Subprogram_Type
then
- -- If the call is an internal one, it is rewritten as a call to
- -- to the corresponding unprotected subprogram.
+ -- If the call is an internal one, it is rewritten as a call to the
+ -- corresponding unprotected subprogram.
Expand_Protected_Subprogram_Call (N, Subp, Scop);
end if;
- -- Functions returning controlled objects need special attention
+ -- Functions returning controlled objects need special attention:
+ -- if the return type is limited, the context is an initialization
+ -- and different processing applies. If the call is to a protected
+ -- function, the expansion above will call Expand_Call recusively.
+ -- To prevent a double attachment, check that the current call is
+ -- not a rewriting of a protected function call.
- if Controlled_Type (Etype (Subp))
+ if Needs_Finalization (Etype (Subp))
and then not Is_Inherently_Limited_Type (Etype (Subp))
+ and then
+ (No (First_Formal (Subp))
+ or else
+ not Is_Concurrent_Record_Type (Etype (First_Formal (Subp))))
then
Expand_Ctrl_Function_Call (N);
end if;
- -- Test for First_Optional_Parameter, and if so, truncate parameter
- -- list if there are optional parameters at the trailing end.
- -- Note we never delete procedures for call via a pointer.
+ -- Test for First_Optional_Parameter, and if so, truncate parameter list
+ -- if there are optional parameters at the trailing end.
+ -- Note: we never delete procedures for call via a pointer.
if (Ekind (Subp) = E_Procedure or else Ekind (Subp) = E_Function)
and then Present (First_Optional_Parameter (Subp))
Last_Keep_Arg : Node_Id;
begin
- -- Last_Keep_Arg will hold the last actual that should be
- -- retained. If it remains empty at the end, it means that
- -- all parameters are optional.
+ -- Last_Keep_Arg will hold the last actual that should be kept.
+ -- If it remains empty at the end, it means that all parameters
+ -- are optional.
Last_Keep_Arg := Empty;
- -- Find first optional parameter, must be present since we
- -- checked the validity of the parameter before setting it.
+ -- Find first optional parameter, must be present since we checked
+ -- the validity of the parameter before setting it.
Formal := First_Formal (Subp);
Actual := First_Actual (N);
-- If no arguments, delete entire list, this is the easy case
if No (Last_Keep_Arg) then
- while Is_Non_Empty_List (Parameter_Associations (N)) loop
- Delete_Tree (Remove_Head (Parameter_Associations (N)));
- end loop;
-
Set_Parameter_Associations (N, No_List);
Set_First_Named_Actual (N, Empty);
elsif Is_List_Member (Last_Keep_Arg) then
while Present (Next (Last_Keep_Arg)) loop
- Delete_Tree (Remove_Next (Last_Keep_Arg));
+ Discard_Node (Remove_Next (Last_Keep_Arg));
end loop;
Set_First_Named_Actual (N, Empty);
Temp : Node_Id;
Passoc : Node_Id;
- Discard : Node_Id;
- pragma Warnings (Off, Discard);
-
begin
-- First step, remove all the named parameters from the
-- list (they are still chained using First_Named_Actual
end loop;
while Present (Next (Temp)) loop
- Discard := Remove_Next (Temp);
+ Remove (Next (Temp));
end loop;
end if;
exit when No (Temp);
Set_Next_Named_Actual
(Passoc, Next_Named_Actual (Parent (Temp)));
- Delete_Tree (Temp);
end loop;
end;
- end if;
- end;
- end if;
- -- Special processing for Ada 2005 AI-329, which requires a call to
- -- Raise_Exception to raise Constraint_Error if the Exception_Id is
- -- null. Note that we never need to do this in GNAT mode, or if the
- -- parameter to Raise_Exception is a use of Identity, since in these
- -- cases we know that the parameter is never null.
-
- if Ada_Version >= Ada_05
- and then not GNAT_Mode
- and then Is_RTE (Subp, RE_Raise_Exception)
- and then (Nkind (First_Actual (N)) /= N_Attribute_Reference
- or else Attribute_Name (First_Actual (N)) /= Name_Identity)
- then
- declare
- RCE : constant Node_Id :=
- Make_Raise_Constraint_Error (Loc,
- Reason => CE_Null_Exception_Id);
- begin
- Insert_After (N, RCE);
- Analyze (RCE);
+ end if;
end;
end if;
end Expand_Call;
Is_Unc : constant Boolean :=
Is_Array_Type (Etype (Subp))
and then not Is_Constrained (Etype (Subp));
- -- If the type returned by the function is unconstrained and the
- -- call can be inlined, special processing is required.
-
- function Is_Null_Procedure return Boolean;
- -- Predicate to recognize stubbed procedures and null procedures, for
- -- which there is no need for the full inlining mechanism.
+ -- If the type returned by the function is unconstrained and the call
+ -- can be inlined, special processing is required.
procedure Make_Exit_Label;
- -- Build declaration for exit label to be used in Return statements
+ -- Build declaration for exit label to be used in Return statements,
+ -- sets Exit_Lab (the label node) and Lab_Decl (corresponding implcit
+ -- declaration).
function Process_Formals (N : Node_Id) return Traverse_Result;
- -- Replace occurrence of a formal with the corresponding actual, or
- -- the thunk generated for it.
+ -- Replace occurrence of a formal with the corresponding actual, or the
+ -- thunk generated for it.
function Process_Sloc (Nod : Node_Id) return Traverse_Result;
- -- If the call being expanded is that of an internal subprogram,
- -- set the sloc of the generated block to that of the call itself,
- -- so that the expansion is skipped by the -next- command in gdb.
+ -- If the call being expanded is that of an internal subprogram, set the
+ -- sloc of the generated block to that of the call itself, so that the
+ -- expansion is skipped by the "next" command in gdb.
-- Same processing for a subprogram in a predefined file, e.g.
- -- Ada.Tags. If Debug_Generated_Code is true, suppress this change
- -- to simplify our own development.
+ -- Ada.Tags. If Debug_Generated_Code is true, suppress this change to
+ -- simplify our own development.
procedure Rewrite_Function_Call (N : Node_Id; Blk : Node_Id);
-- If the function body is a single expression, replace call with
function Formal_Is_Used_Once (Formal : Entity_Id) return Boolean;
-- Determine whether a formal parameter is used only once in Orig_Bod
- -----------------------
- -- Is_Null_Procedure --
- -----------------------
-
- function Is_Null_Procedure return Boolean is
- Decl : constant Node_Id := Unit_Declaration_Node (Subp);
-
- begin
- if Ekind (Subp) /= E_Procedure then
- return False;
-
- elsif Nkind (Orig_Bod) /= N_Subprogram_Body then
- return False;
-
- -- Check if this is an ada 2005 null procedure
-
- elsif Nkind (Decl) = N_Subprogram_Declaration
- and then Null_Present (Specification (Decl))
- then
- return True;
-
- -- Check if the body contains only a null statement, followed by the
- -- return statement added during expansion.
-
- else
- declare
- Stat : constant Node_Id :=
- First
- (Statements (Handled_Statement_Sequence (Orig_Bod)));
-
- Stat2 : constant Node_Id := Next (Stat);
-
- begin
- return
- Nkind (Stat) = N_Null_Statement
- and then
- (No (Stat2)
- or else
- (Nkind (Stat2) = N_Return_Statement
- and then No (Next (Stat2))));
- end;
- end if;
- end Is_Null_Procedure;
-
---------------------
-- Make_Exit_Label --
---------------------
Rewrite (N, New_Occurrence_Of (A, Loc));
Check_Private_View (N);
- else -- numeric literal
+ -- Numeric literal
+
+ else
Rewrite (N, New_Copy (A));
end if;
end if;
return Skip;
- elsif Nkind (N) = N_Return_Statement then
-
+ elsif Nkind (N) = N_Simple_Return_Statement then
if No (Expression (N)) then
Make_Exit_Label;
- Rewrite (N, Make_Goto_Statement (Loc,
- Name => New_Copy (Lab_Id)));
+ Rewrite (N,
+ Make_Goto_Statement (Loc,
+ Name => New_Copy (Lab_Id)));
else
if Nkind (Parent (N)) = N_Handled_Sequence_Of_Statements
-- Because of the presence of private types, the views of the
-- expression and the context may be different, so place an
-- unchecked conversion to the context type to avoid spurious
- -- errors, eg. when the expression is a numeric literal and
+ -- errors, e.g. when the expression is a numeric literal and
-- the context is private. If the expression is an aggregate,
-- use a qualified expression, because an aggregate is not a
-- legal argument of a conversion.
- if Nkind (Expression (N)) = N_Aggregate
- or else Nkind (Expression (N)) = N_Null
- then
+ if Nkind_In (Expression (N), N_Aggregate, N_Null) then
Ret :=
Make_Qualified_Expression (Sloc (N),
Subtype_Mark => New_Occurrence_Of (Ret_Type, Sloc (N)),
-- not be posting warnings on the inlined body so it is unneeded.
elsif Nkind (N) = N_Pragma
- and then Chars (N) = Name_Unreferenced
+ and then Pragma_Name (N) = Name_Unreferenced
then
Rewrite (N, Make_Null_Statement (Sloc (N)));
return OK;
-- Start of processing for Expand_Inlined_Call
begin
- -- Check for special case of To_Address call, and if so, just do an
- -- unchecked conversion instead of expanding the call. Not only is this
- -- more efficient, but it also avoids problem with order of elaboration
- -- when address clauses are inlined (address expression elaborated at
- -- wrong point).
-
- if Subp = RTE (RE_To_Address) then
- Rewrite (N,
- Unchecked_Convert_To
- (RTE (RE_Address),
- Relocate_Node (First_Actual (N))));
- return;
-
- elsif Is_Null_Procedure then
- Rewrite (N, Make_Null_Statement (Loc));
- return;
- end if;
-- Check for an illegal attempt to inline a recursive procedure. If the
-- subprogram has parameters this is detected when trying to supply a
-- If the actual is a simple name or a literal, no need to
-- create a temporary, object can be used directly.
+ -- If the actual is a literal and the formal has its address taken,
+ -- we cannot pass the literal itself as an argument, so its value
+ -- must be captured in a temporary.
+
if (Is_Entity_Name (A)
and then
(not Is_Scalar_Type (Etype (A))
or else (Nkind (A) = N_Identifier
and then Formal_Is_Used_Once (F))
- or else Nkind (A) = N_Real_Literal
- or else Nkind (A) = N_Integer_Literal
- or else Nkind (A) = N_Character_Literal
+ or else
+ (Nkind_In (A, N_Real_Literal,
+ N_Integer_Literal,
+ N_Character_Literal)
+ and then not Address_Taken (F))
then
if Etype (F) /= Etype (A) then
Set_Renamed_Object
-- If the actual has a by-reference type, it cannot be copied, so
-- its value is captured in a renaming declaration. Otherwise
- -- declare a local constant initalized with the actual.
+ -- declare a local constant initialized with the actual.
+
+ -- We also use a renaming declaration for expressions of an array
+ -- type that is not bit-packed, both for efficiency reasons and to
+ -- respect the semantics of the call: in most cases the original
+ -- call will pass the parameter by reference, and thus the inlined
+ -- code will have the same semantics.
if Ekind (F) = E_In_Parameter
and then not Is_Limited_Type (Etype (A))
and then not Is_Tagged_Type (Etype (A))
+ and then
+ (not Is_Array_Type (Etype (A))
+ or else not Is_Object_Reference (A)
+ or else Is_Bit_Packed_Array (Etype (A)))
then
Decl :=
Make_Object_Declaration (Loc,
Make_Defining_Identifier (Loc, New_Internal_Name ('C'));
Set_Is_Internal (Temp);
- -- For the unconstrained case. the generated temporary has the
- -- same constrained declaration as the result variable.
- -- It may eventually be possible to remove that temporary and
- -- use the result variable directly.
+ -- For the unconstrained case, the generated temporary has the
+ -- same constrained declaration as the result variable. It may
+ -- eventually be possible to remove that temporary and use the
+ -- result variable directly.
if Is_Unc then
Decl :=
end if;
-- Analyze Blk with In_Inlined_Body set, to avoid spurious errors on
- -- conflicting private views that Gigi would ignore. If this is
+ -- conflicting private views that Gigi would ignore. If this is a
-- predefined unit, analyze with checks off, as is done in the non-
-- inlined run-time units.
----------------------------
procedure Expand_N_Function_Call (N : Node_Id) is
- Typ : constant Entity_Id := Etype (N);
-
- function Returned_By_Reference return Boolean;
- -- If the return type is returned through the secondary stack; that is
- -- by reference, we don't want to create a temp to force stack checking.
- -- ???"sec stack" is not right -- Ada 95 return-by-reference object are
- -- returned whereever they are.
- -- Shouldn't this function be moved to exp_util???
-
- function Rhs_Of_Assign_Or_Decl (N : Node_Id) return Boolean;
- -- If the call is the right side of an assignment or the expression in
- -- an object declaration, we don't need to create a temp as the left
- -- side will already trigger stack checking if necessary.
- --
- -- If the call is a component in an extension aggregate, it will be
- -- expanded into assignments as well, so no temporary is needed. This
- -- also solves the problem of functions returning types with unknown
- -- discriminants, where it is not possible to declare an object of the
- -- type altogether.
-
- ---------------------------
- -- Returned_By_Reference --
- ---------------------------
+ begin
+ Expand_Call (N);
- function Returned_By_Reference return Boolean is
- S : Entity_Id;
+ -- If the return value of a foreign compiled function is VAX Float, then
+ -- expand the return (adjusts the location of the return value on
+ -- Alpha/VMS, no-op everywhere else).
+ -- Comes_From_Source intercepts recursive expansion.
+
+ if Vax_Float (Etype (N))
+ and then Nkind (N) = N_Function_Call
+ and then Present (Name (N))
+ and then Present (Entity (Name (N)))
+ and then Has_Foreign_Convention (Entity (Name (N)))
+ and then Comes_From_Source (Parent (N))
+ then
+ Expand_Vax_Foreign_Return (N);
+ end if;
+ end Expand_N_Function_Call;
- begin
- if Is_Inherently_Limited_Type (Typ) then
- return True;
+ ---------------------------------------
+ -- Expand_N_Procedure_Call_Statement --
+ ---------------------------------------
- elsif Nkind (Parent (N)) /= N_Return_Statement then
- return False;
-
- elsif Requires_Transient_Scope (Typ) then
-
- -- Verify that the return type of the enclosing function has the
- -- same constrained status as that of the expression.
-
- S := Current_Scope;
- while Ekind (S) /= E_Function loop
- S := Scope (S);
- end loop;
-
- return Is_Constrained (Typ) = Is_Constrained (Etype (S));
- else
- return False;
- end if;
- end Returned_By_Reference;
-
- ---------------------------
- -- Rhs_Of_Assign_Or_Decl --
- ---------------------------
-
- function Rhs_Of_Assign_Or_Decl (N : Node_Id) return Boolean is
- begin
- if (Nkind (Parent (N)) = N_Assignment_Statement
- and then Expression (Parent (N)) = N)
- or else
- (Nkind (Parent (N)) = N_Qualified_Expression
- and then Nkind (Parent (Parent (N))) = N_Assignment_Statement
- and then Expression (Parent (Parent (N))) = Parent (N))
- or else
- (Nkind (Parent (N)) = N_Object_Declaration
- and then Expression (Parent (N)) = N)
- or else
- (Nkind (Parent (N)) = N_Component_Association
- and then Expression (Parent (N)) = N
- and then Nkind (Parent (Parent (N))) = N_Aggregate
- and then Rhs_Of_Assign_Or_Decl (Parent (Parent (N))))
- or else
- (Nkind (Parent (N)) = N_Extension_Aggregate
- and then Is_Private_Type (Etype (Typ)))
- then
- return True;
- else
- return False;
- end if;
- end Rhs_Of_Assign_Or_Decl;
-
- -- Start of processing for Expand_N_Function_Call
-
- begin
- -- A special check. If stack checking is enabled, and the return type
- -- might generate a large temporary, and the call is not the right side
- -- of an assignment, then generate an explicit temporary. We do this
- -- because otherwise gigi may generate a large temporary on the fly and
- -- this can cause trouble with stack checking.
-
- -- This is unecessary if the call is the expression in an object
- -- declaration, or if it appears outside of any library unit. This can
- -- only happen if it appears as an actual in a library-level instance,
- -- in which case a temporary will be generated for it once the instance
- -- itself is installed.
-
- if May_Generate_Large_Temp (Typ)
- and then not Rhs_Of_Assign_Or_Decl (N)
- and then not Returned_By_Reference
- and then Current_Scope /= Standard_Standard
- then
- if Stack_Checking_Enabled then
-
- -- Note: it might be thought that it would be OK to use a call to
- -- Force_Evaluation here, but that's not good enough, because
- -- that can results in a 'Reference construct that may still need
- -- a temporary.
-
- declare
- Loc : constant Source_Ptr := Sloc (N);
- Temp_Obj : constant Entity_Id :=
- Make_Defining_Identifier (Loc,
- Chars => New_Internal_Name ('F'));
- Temp_Typ : Entity_Id := Typ;
- Decl : Node_Id;
- A : Node_Id;
- F : Entity_Id;
- Proc : Entity_Id;
-
- begin
- if Is_Tagged_Type (Typ)
- and then Present (Controlling_Argument (N))
- then
- if Nkind (Parent (N)) /= N_Procedure_Call_Statement
- and then Nkind (Parent (N)) /= N_Function_Call
- then
- -- If this is a tag-indeterminate call, the object must
- -- be classwide.
-
- if Is_Tag_Indeterminate (N) then
- Temp_Typ := Class_Wide_Type (Typ);
- end if;
-
- else
- -- If this is a dispatching call that is itself the
- -- controlling argument of an enclosing call, the
- -- nominal subtype of the object that replaces it must
- -- be classwide, so that dispatching will take place
- -- properly. If it is not a controlling argument, the
- -- object is not classwide.
-
- Proc := Entity (Name (Parent (N)));
-
- F := First_Formal (Proc);
- A := First_Actual (Parent (N));
- while A /= N loop
- Next_Formal (F);
- Next_Actual (A);
- end loop;
-
- if Is_Controlling_Formal (F) then
- Temp_Typ := Class_Wide_Type (Typ);
- end if;
- end if;
- end if;
-
- Decl :=
- Make_Object_Declaration (Loc,
- Defining_Identifier => Temp_Obj,
- Object_Definition => New_Occurrence_Of (Temp_Typ, Loc),
- Constant_Present => True,
- Expression => Relocate_Node (N));
- Set_Assignment_OK (Decl);
-
- Insert_Actions (N, New_List (Decl));
- Rewrite (N, New_Occurrence_Of (Temp_Obj, Loc));
- end;
-
- else
- -- If stack-checking is not enabled, increment serial number
- -- for internal names, so that subsequent symbols are consistent
- -- with and without stack-checking.
-
- Synchronize_Serial_Number;
-
- -- Now we can expand the call with consistent symbol names
-
- Expand_Call (N);
- end if;
-
- -- Normal case, expand the call
-
- else
- Expand_Call (N);
- end if;
- end Expand_N_Function_Call;
-
- ---------------------------------------
- -- Expand_N_Procedure_Call_Statement --
- ---------------------------------------
-
- procedure Expand_N_Procedure_Call_Statement (N : Node_Id) is
- begin
- Expand_Call (N);
- end Expand_N_Procedure_Call_Statement;
+ procedure Expand_N_Procedure_Call_Statement (N : Node_Id) is
+ begin
+ Expand_Call (N);
+ end Expand_N_Procedure_Call_Statement;
------------------------------
-- Expand_N_Subprogram_Body --
------------------------------
- -- Add poll call if ATC polling is enabled, unless the body will be
- -- inlined by the back-end.
+ -- Add poll call if ATC polling is enabled, unless the body will be inlined
+ -- by the back-end.
+
+ -- Add dummy push/pop label nodes at start and end to clear any local
+ -- exception indications if local-exception-to-goto optimization is active.
-- Add return statement if last statement in body is not a return statement
-- (this makes things easier on Gigi which does not want to have to handle
Loc : constant Source_Ptr := Sloc (N);
H : constant Node_Id := Handled_Statement_Sequence (N);
Body_Id : Entity_Id;
- Spec_Id : Entity_Id;
Except_H : Node_Id;
- Scop : Entity_Id;
- Dec : Node_Id;
- Next_Op : Node_Id;
L : List_Id;
+ Spec_Id : Entity_Id;
procedure Add_Return (S : List_Id);
-- Append a return statement to the statement sequence S if the last
-- statement is not already a return or a goto statement. Note that
- -- the latter test is not critical, it does not matter if we add a
- -- few extra returns, since they get eliminated anyway later on.
-
- procedure Expand_Thread_Body;
- -- Perform required expansion of a thread body
+ -- the latter test is not critical, it does not matter if we add a few
+ -- extra returns, since they get eliminated anyway later on.
----------------
-- Add_Return --
----------------
procedure Add_Return (S : List_Id) is
- begin
- if not Is_Transfer (Last (S)) then
-
- -- The source location for the return is the end label
- -- of the procedure in all cases. This is a bit odd when
- -- there are exception handlers, but not much else we can do.
-
- Append_To (S, Make_Return_Statement (Sloc (End_Label (H))));
- end if;
- end Add_Return;
-
- ------------------------
- -- Expand_Thread_Body --
- ------------------------
-
- -- The required expansion of a thread body is as follows
-
- -- procedure <thread body procedure name> is
-
- -- _Secondary_Stack : aliased
- -- Storage_Elements.Storage_Array
- -- (1 .. Storage_Offset (Sec_Stack_Size));
- -- for _Secondary_Stack'Alignment use Standard'Maximum_Alignment;
-
- -- _Process_ATSD : aliased System.Threads.ATSD;
-
- -- begin
- -- System.Threads.Thread_Body_Enter;
- -- (_Secondary_Stack'Address,
- -- _Secondary_Stack'Length,
- -- _Process_ATSD'Address);
-
- -- declare
- -- <user declarations>
- -- begin
- -- <user statements>
- -- <user exception handlers>
- -- end;
-
- -- System.Threads.Thread_Body_Leave;
-
- -- exception
- -- when E : others =>
- -- System.Threads.Thread_Body_Exceptional_Exit (E);
- -- end;
-
- -- Note the exception handler is omitted if pragma Restriction
- -- No_Exception_Handlers is currently active.
-
- procedure Expand_Thread_Body is
- User_Decls : constant List_Id := Declarations (N);
- Sec_Stack_Len : Node_Id;
-
- TB_Pragma : constant Node_Id :=
- Get_Rep_Pragma (Spec_Id, Name_Thread_Body);
-
- Ent_SS : Entity_Id;
- Ent_ATSD : Entity_Id;
- Ent_EO : Entity_Id;
-
- Decl_SS : Node_Id;
- Decl_ATSD : Node_Id;
-
- Excep_Handlers : List_Id;
+ Last_Stm : Node_Id;
+ Loc : Source_Ptr;
begin
- New_Scope (Spec_Id);
+ -- Get last statement, ignoring any Pop_xxx_Label nodes, which are
+ -- not relevant in this context since they are not executable.
- -- Get proper setting for secondary stack size
-
- if List_Length (Pragma_Argument_Associations (TB_Pragma)) = 2 then
- Sec_Stack_Len :=
- Expression (Last (Pragma_Argument_Associations (TB_Pragma)));
- else
- Sec_Stack_Len :=
- New_Occurrence_Of (RTE (RE_Default_Secondary_Stack_Size), Loc);
- end if;
-
- Sec_Stack_Len := Convert_To (RTE (RE_Storage_Offset), Sec_Stack_Len);
+ Last_Stm := Last (S);
+ while Nkind (Last_Stm) in N_Pop_xxx_Label loop
+ Prev (Last_Stm);
+ end loop;
- -- Build and set declarations for the wrapped thread body
+ -- Now insert return unless last statement is a transfer
- Ent_SS :=
- Make_Defining_Identifier (Loc,
- Chars => Name_uSecondary_Stack);
- Ent_ATSD :=
- Make_Defining_Identifier (Loc,
- Chars => Name_uProcess_ATSD);
+ if not Is_Transfer (Last_Stm) then
- Decl_SS :=
- Make_Object_Declaration (Loc,
- Defining_Identifier => Ent_SS,
- Aliased_Present => True,
- Object_Definition =>
- Make_Subtype_Indication (Loc,
- Subtype_Mark =>
- New_Occurrence_Of (RTE (RE_Storage_Array), Loc),
- Constraint =>
- Make_Index_Or_Discriminant_Constraint (Loc,
- Constraints => New_List (
- Make_Range (Loc,
- Low_Bound => Make_Integer_Literal (Loc, 1),
- High_Bound => Sec_Stack_Len)))));
-
- Decl_ATSD :=
- Make_Object_Declaration (Loc,
- Defining_Identifier => Ent_ATSD,
- Aliased_Present => True,
- Object_Definition => New_Occurrence_Of (RTE (RE_ATSD), Loc));
+ -- The source location for the return is the end label of the
+ -- procedure if present. Otherwise use the sloc of the last
+ -- statement in the list. If the list comes from a generated
+ -- exception handler and we are not debugging generated code,
+ -- all the statements within the handler are made invisible
+ -- to the debugger.
- Set_Declarations (N, New_List (Decl_SS, Decl_ATSD));
- Analyze (Decl_SS);
- Analyze (Decl_ATSD);
- Set_Alignment (Ent_SS, UI_From_Int (Maximum_Alignment));
+ if Nkind (Parent (S)) = N_Exception_Handler
+ and then not Comes_From_Source (Parent (S))
+ then
+ Loc := Sloc (Last_Stm);
- -- Create new exception handler
+ elsif Present (End_Label (H)) then
+ Loc := Sloc (End_Label (H));
- if Restriction_Active (No_Exception_Handlers) then
- Excep_Handlers := No_List;
+ else
+ Loc := Sloc (Last_Stm);
+ end if;
- else
- Check_Restriction (No_Exception_Handlers, N);
+ declare
+ Rtn : constant Node_Id := Make_Simple_Return_Statement (Loc);
- Ent_EO :=
- Make_Defining_Identifier (Loc,
- Chars => Name_uE);
+ begin
+ -- Append return statement, and set analyzed manually. We can't
+ -- call Analyze on this return since the scope is wrong.
- Excep_Handlers := New_List (
- Make_Implicit_Exception_Handler (Loc,
- Choice_Parameter => Ent_EO,
- Exception_Choices => New_List (
- Make_Others_Choice (Loc)),
- Statements => New_List (
- Make_Procedure_Call_Statement (Loc,
- Name =>
- New_Occurrence_Of
- (RTE (RE_Thread_Body_Exceptional_Exit), Loc),
- Parameter_Associations => New_List (
- New_Occurrence_Of (Ent_EO, Loc))))));
- end if;
+ -- Note: it almost works to push the scope and then do the
+ -- Analyze call, but something goes wrong in some weird cases
+ -- and it is not worth worrying about ???
- -- Now build new handled statement sequence and analyze it
+ Append_To (S, Rtn);
+ Set_Analyzed (Rtn);
- Set_Handled_Statement_Sequence (N,
- Make_Handled_Sequence_Of_Statements (Loc,
- Statements => New_List (
+ -- Call _Postconditions procedure if appropriate. We need to
+ -- do this explicitly because we did not analyze the generated
+ -- return statement above, so the call did not get inserted.
- Make_Procedure_Call_Statement (Loc,
- Name => New_Occurrence_Of (RTE (RE_Thread_Body_Enter), Loc),
- Parameter_Associations => New_List (
+ if Ekind (Spec_Id) = E_Procedure
+ and then Has_Postconditions (Spec_Id)
+ then
+ pragma Assert (Present (Postcondition_Proc (Spec_Id)));
+ Insert_Action (Rtn,
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (Postcondition_Proc (Spec_Id), Loc)));
+ end if;
+ end;
+ end if;
+ end Add_Return;
- Make_Attribute_Reference (Loc,
- Prefix => New_Occurrence_Of (Ent_SS, Loc),
- Attribute_Name => Name_Address),
+ -- Start of processing for Expand_N_Subprogram_Body
- Make_Attribute_Reference (Loc,
- Prefix => New_Occurrence_Of (Ent_SS, Loc),
- Attribute_Name => Name_Length),
+ begin
+ -- Set L to either the list of declarations if present, or to the list
+ -- of statements if no declarations are present. This is used to insert
+ -- new stuff at the start.
- Make_Attribute_Reference (Loc,
- Prefix => New_Occurrence_Of (Ent_ATSD, Loc),
- Attribute_Name => Name_Address))),
+ if Is_Non_Empty_List (Declarations (N)) then
+ L := Declarations (N);
+ else
+ L := Statements (H);
+ end if;
- Make_Block_Statement (Loc,
- Declarations => User_Decls,
- Handled_Statement_Sequence => H),
+ -- If local-exception-to-goto optimization active, insert dummy push
+ -- statements at start, and dummy pop statements at end.
- Make_Procedure_Call_Statement (Loc,
- Name => New_Occurrence_Of (RTE (RE_Thread_Body_Leave), Loc))),
+ if (Debug_Flag_Dot_G
+ or else Restriction_Active (No_Exception_Propagation))
+ and then Is_Non_Empty_List (L)
+ then
+ declare
+ FS : constant Node_Id := First (L);
+ FL : constant Source_Ptr := Sloc (FS);
+ LS : Node_Id;
+ LL : Source_Ptr;
- Exception_Handlers => Excep_Handlers));
+ begin
+ -- LS points to either last statement, if statements are present
+ -- or to the last declaration if there are no statements present.
+ -- It is the node after which the pop's are generated.
- Analyze (Handled_Statement_Sequence (N));
- End_Scope;
- end Expand_Thread_Body;
+ if Is_Non_Empty_List (Statements (H)) then
+ LS := Last (Statements (H));
+ else
+ LS := Last (L);
+ end if;
- -- Start of processing for Expand_N_Subprogram_Body
+ LL := Sloc (LS);
- begin
- -- Set L to either the list of declarations if present, or
- -- to the list of statements if no declarations are present.
- -- This is used to insert new stuff at the start.
+ Insert_List_Before_And_Analyze (FS, New_List (
+ Make_Push_Constraint_Error_Label (FL),
+ Make_Push_Program_Error_Label (FL),
+ Make_Push_Storage_Error_Label (FL)));
- if Is_Non_Empty_List (Declarations (N)) then
- L := Declarations (N);
- else
- L := Statements (Handled_Statement_Sequence (N));
+ Insert_List_After_And_Analyze (LS, New_List (
+ Make_Pop_Constraint_Error_Label (LL),
+ Make_Pop_Program_Error_Label (LL),
+ Make_Pop_Storage_Error_Label (LL)));
+ end;
end if;
-- Find entity for subprogram
Spec_Id := Body_Id;
end if;
- -- Need poll on entry to subprogram if polling enabled. We only
- -- do this for non-empty subprograms, since it does not seem
- -- necessary to poll for a dummy null subprogram. Do not add polling
- -- point if calls to this subprogram will be inlined by the back-end,
- -- to avoid repeated polling points in nested inlinings.
+ -- Need poll on entry to subprogram if polling enabled. We only do this
+ -- for non-empty subprograms, since it does not seem necessary to poll
+ -- for a dummy null subprogram.
if Is_Non_Empty_List (L) then
+
+ -- Do not add a polling call if the subprogram is to be inlined by
+ -- the back-end, to avoid repeated calls with multiple inlinings.
+
if Is_Inlined (Spec_Id)
and then Front_End_Inlining
and then Optimization_Level > 1
end if;
end if;
- -- If this is a Pure function which has any parameters whose root
- -- type is System.Address, reset the Pure indication, since it will
- -- likely cause incorrect code to be generated as the parameter is
- -- probably a pointer, and the fact that the same pointer is passed
- -- does not mean that the same value is being referenced.
+ -- If this is a Pure function which has any parameters whose root type
+ -- is System.Address, reset the Pure indication, since it will likely
+ -- cause incorrect code to be generated as the parameter is probably
+ -- a pointer, and the fact that the same pointer is passed does not mean
+ -- that the same value is being referenced.
-- Note that if the programmer gave an explicit Pure_Function pragma,
-- then we believe the programmer, and leave the subprogram Pure.
- -- This code should probably be at the freeze point, so that it
- -- happens even on a -gnatc (or more importantly -gnatt) compile
- -- so that the semantic tree has Is_Pure set properly ???
+ -- This code should probably be at the freeze point, so that it happens
+ -- even on a -gnatc (or more importantly -gnatt) compile, so that the
+ -- semantic tree has Is_Pure set properly ???
if Is_Pure (Spec_Id)
and then Is_Subprogram (Spec_Id)
if Is_Scalar_Type (Etype (F))
and then Ekind (F) = E_Out_Parameter
then
+ Check_Restriction (No_Default_Initialization, F);
+
-- Insert the initialization. We turn off validity checks
-- for this assignment, since we do not want any check on
-- the initial value itself (which may well be invalid).
Insert_Before_And_Analyze (First (L),
Make_Assignment_Statement (Loc,
Name => New_Occurrence_Of (F, Loc),
- Expression => Get_Simple_Init_Val (Etype (F), Loc)),
+ Expression => Get_Simple_Init_Val (Etype (F), N)),
Suppress => Validity_Check);
end if;
end;
end if;
- Scop := Scope (Spec_Id);
-
- -- Add discriminal renamings to protected subprograms. Install new
- -- discriminals for expansion of the next subprogram of this protected
- -- type, if any.
-
- if Is_List_Member (N)
- and then Present (Parent (List_Containing (N)))
- and then Nkind (Parent (List_Containing (N))) = N_Protected_Body
- then
- Add_Discriminal_Declarations
- (Declarations (N), Scop, Name_uObject, Loc);
- Add_Private_Declarations (Declarations (N), Scop, Name_uObject, Loc);
-
- -- Associate privals and discriminals with the next protected
- -- operation body to be expanded. These are used to expand references
- -- to private data objects and discriminants, respectively.
-
- Next_Op := Next_Protected_Operation (N);
-
- if Present (Next_Op) then
- Dec := Parent (Base_Type (Scop));
- Set_Privals (Dec, Next_Op, Loc);
- Set_Discriminals (Dec);
- end if;
- end if;
-
-- Clear out statement list for stubbed procedure
if Present (Corresponding_Spec (N)) then
end if;
end if;
- -- Returns_By_Ref flag is normally set when the subprogram is frozen
- -- but subprograms with no specs are not frozen.
+ -- Create a set of discriminals for the next protected subprogram body
+
+ if Is_List_Member (N)
+ and then Present (Parent (List_Containing (N)))
+ and then Nkind (Parent (List_Containing (N))) = N_Protected_Body
+ and then Present (Next_Protected_Operation (N))
+ then
+ Set_Discriminals (Parent (Base_Type (Scope (Spec_Id))));
+ end if;
+
+ -- Returns_By_Ref flag is normally set when the subprogram is frozen but
+ -- subprograms with no specs are not frozen.
declare
Typ : constant Entity_Id := Etype (Spec_Id);
elsif Is_Inherently_Limited_Type (Typ) then
Set_Returns_By_Ref (Spec_Id);
- elsif Present (Utyp) and then CW_Or_Controlled_Type (Utyp) then
+ elsif Present (Utyp) and then CW_Or_Has_Controlled_Part (Utyp) then
Set_Returns_By_Ref (Spec_Id);
end if;
end;
- -- For a procedure, we add a return for all possible syntactic ends
- -- of the subprogram. Note that reanalysis is not necessary in this
- -- case since it would require a lot of work and accomplish nothing.
+ -- For a procedure, we add a return for all possible syntactic ends of
+ -- the subprogram.
if Ekind (Spec_Id) = E_Procedure
or else Ekind (Spec_Id) = E_Generic_Procedure
-- raise Program_Error;
-- end;
- -- This approach is necessary because the raise must be signalled
- -- to the caller, not handled by any local handler (RM 6.4(11)).
+ -- This approach is necessary because the raise must be signalled to the
+ -- caller, not handled by any local handler (RM 6.4(11)).
- -- Note: we do not need to analyze the constructed sequence here,
- -- since it has no handler, and an attempt to analyze the handled
- -- statement sequence twice is risky in various ways (e.g. the
- -- issue of expanding cleanup actions twice).
+ -- Note: we do not need to analyze the constructed sequence here, since
+ -- it has no handler, and an attempt to analyze the handled statement
+ -- sequence twice is risky in various ways (e.g. the issue of expanding
+ -- cleanup actions twice).
elsif Has_Missing_Return (Spec_Id) then
declare
Make_Handled_Sequence_Of_Statements (Hloc,
Statements => New_List (Blok, Rais)));
- New_Scope (Spec_Id);
+ Push_Scope (Spec_Id);
Analyze (Blok);
Analyze (Rais);
Pop_Scope;
Detect_Infinite_Recursion (N, Spec_Id);
end if;
- -- Finally, if we are in Normalize_Scalars mode, then any scalar out
- -- parameters must be initialized to the appropriate default value.
-
- if Ekind (Spec_Id) = E_Procedure and then Normalize_Scalars then
- declare
- Floc : Source_Ptr;
- Formal : Entity_Id;
- Stm : Node_Id;
-
- begin
- Formal := First_Formal (Spec_Id);
- while Present (Formal) loop
- Floc := Sloc (Formal);
-
- if Ekind (Formal) = E_Out_Parameter
- and then Is_Scalar_Type (Etype (Formal))
- then
- Stm :=
- Make_Assignment_Statement (Floc,
- Name => New_Occurrence_Of (Formal, Floc),
- Expression =>
- Get_Simple_Init_Val (Etype (Formal), Floc));
- Prepend (Stm, Declarations (N));
- Analyze (Stm);
- end if;
-
- Next_Formal (Formal);
- end loop;
- end;
- end if;
-
- -- Deal with thread body
-
- if Is_Thread_Body (Spec_Id) then
- Expand_Thread_Body;
- end if;
-
-- Set to encode entity names in package body before gigi is called
Qualify_Entity_Names (N);
-- The protected subprogram is declared outside of the protected
-- body. Given that the body has frozen all entities so far, we
-- analyze the subprogram and perform freezing actions explicitly.
+ -- including the generation of an explicit freeze node, to ensure
+ -- that gigi has the proper order of elaboration.
-- If the body is a subunit, the insertion point is before the
-- stub in the parent.
Insert_Before (Prot_Bod, Prot_Decl);
Prot_Id := Defining_Unit_Name (Specification (Prot_Decl));
+ Set_Has_Delayed_Freeze (Prot_Id);
- New_Scope (Scope (Scop));
+ Push_Scope (Scope (Scop));
Analyze (Prot_Decl);
- Create_Extra_Formals (Prot_Id);
+ Insert_Actions (N, Freeze_Entity (Prot_Id, Loc));
Set_Protected_Body_Subprogram (Subp, Prot_Id);
+
+ -- Create protected operation as well. Even though the operation
+ -- is only accessible within the body, it is possible to make it
+ -- available outside of the protected object by using 'Access to
+ -- provide a callback, so build protected version in all cases.
+
+ Prot_Decl :=
+ Make_Subprogram_Declaration (Loc,
+ Specification =>
+ Build_Protected_Sub_Specification (N, Scop, Protected_Mode));
+ Insert_Before (Prot_Bod, Prot_Decl);
+ Analyze (Prot_Decl);
+
Pop_Scope;
end if;
- -- Ada 2005 (AI-348): Generation of the null body
+ -- Ada 2005 (AI-348): Generate body for a null procedure.
+ -- In most cases this is superfluous because calls to it
+ -- will be automatically inlined, but we definitely need
+ -- the body if preconditions for the procedure are present.
elsif Nkind (Specification (N)) = N_Procedure_Specification
and then Null_Present (Specification (N))
then
declare
- Bod : constant Node_Id :=
- Make_Subprogram_Body (Loc,
- Specification =>
- New_Copy_Tree (Specification (N)),
- Declarations => New_List,
- Handled_Statement_Sequence =>
- Make_Handled_Sequence_Of_Statements (Loc,
- Statements => New_List (Make_Null_Statement (Loc))));
- begin
- Set_Body_To_Inline (N, Bod);
- Insert_After (N, Bod);
- Analyze (Bod);
+ Bod : constant Node_Id := Body_To_Inline (N);
- -- Corresponding_Spec isn't being set by Analyze_Subprogram_Body,
- -- evidently because Set_Has_Completion is called earlier for null
- -- procedures in Analyze_Subprogram_Declaration, so we force its
- -- setting here. If the setting of Has_Completion is not set
- -- earlier, then it can result in missing body errors if other
- -- errors were already reported (since expansion is turned off).
+ begin
+ Set_Has_Completion (Subp, False);
+ Append_Freeze_Action (Subp, Bod);
- -- Should creation of the empty body be moved to the analyzer???
+ -- The body now contains raise statements, so calls to it will
+ -- not be inlined.
- Set_Corresponding_Spec (Bod, Defining_Entity (Specification (N)));
+ Set_Is_Inlined (Subp, False);
end;
end if;
end Expand_N_Subprogram_Declaration;
-- which denotes the enclosing protected object. If the enclosing
-- operation is an entry, we are immediately within the protected body,
-- and we can retrieve the object from the service entries procedure. A
- -- barrier function has has the same signature as an entry. A barrier
+ -- barrier function has the same signature as an entry. A barrier
-- function is compiled within the protected object, but unlike
-- protected operations its never needs locks, so that its protected
-- body subprogram points to itself.
New_Occurrence_Of (Param, Loc)));
-- Analyze new actual. Other actuals in calls are already analyzed
- -- and the list of actuals is not renalyzed after rewriting.
+ -- and the list of actuals is not reanalyzed after rewriting.
Set_Parent (Rec, N);
Analyze (Rec);
end if;
- Analyze (N);
-
-- If it is a function call it can appear in elaboration code and
-- the called entity must be frozen here.
if Ekind (Subp) = E_Function then
Freeze_Expression (Name (N));
end if;
+
+ -- Analyze and resolve the new call. The actuals have already been
+ -- resolved, but expansion of a function call will add extra actuals
+ -- if needed. Analysis of a procedure call already includes resolution.
+
+ Analyze (N);
+
+ if Ekind (Subp) = E_Function then
+ Resolve (N, Etype (Subp));
+ end if;
end Expand_Protected_Subprogram_Call;
--------------------------------
then
return False;
+ -- In Ada 2005 all functions with an inherently limited return type
+ -- must be handled using a build-in-place profile, including the case
+ -- of a function with a limited interface result, where the function
+ -- may return objects of nonlimited descendants.
+
else
return Is_Inherently_Limited_Type (Etype (E))
and then Ada_Version >= Ada_05
Function_Id : Entity_Id;
begin
- if Nkind (Exp_Node) = N_Qualified_Expression then
+ -- Step past qualification or unchecked conversion (the latter can occur
+ -- in cases of calls to 'Input).
+
+ if Nkind_In
+ (Exp_Node, N_Qualified_Expression, N_Unchecked_Type_Conversion)
+ then
Exp_Node := Expression (N);
end if;
end if;
end Is_Build_In_Place_Function_Call;
- ---------------------------------------
- -- Is_Build_In_Place_Function_Return --
- ---------------------------------------
-
- function Is_Build_In_Place_Function_Return (N : Node_Id) return Boolean is
- begin
- if Nkind (N) = N_Return_Statement
- or else Nkind (N) = N_Extended_Return_Statement
- then
- return Is_Build_In_Place_Function
- (Return_Applies_To (Return_Statement_Entity (N)));
- else
- return False;
- end if;
- end Is_Build_In_Place_Function_Return;
-
-----------------------
-- Freeze_Subprogram --
-----------------------
procedure Freeze_Subprogram (N : Node_Id) is
Loc : constant Source_Ptr := Sloc (N);
- E : constant Entity_Id := Entity (N);
procedure Register_Predefined_DT_Entry (Prim : Entity_Id);
-- (Ada 2005): Register a predefined primitive in all the secondary
Iface_DT_Ptr : Elmt_Id;
Tagged_Typ : Entity_Id;
Thunk_Id : Entity_Id;
+ Thunk_Code : Node_Id;
begin
Tagged_Typ := Find_Dispatching_Type (Prim);
if No (Access_Disp_Table (Tagged_Typ))
- or else not Has_Abstract_Interfaces (Tagged_Typ)
+ or else not Has_Interfaces (Tagged_Typ)
or else not RTE_Available (RE_Interface_Tag)
or else Restriction_Active (No_Dispatching_Calls)
then
return;
end if;
- -- Skip the first access-to-dispatch-table pointer since it leads
- -- to the primary dispatch table. We are only concerned with the
- -- secondary dispatch table pointers. Note that the access-to-
- -- dispatch-table pointer corresponds to the first implemented
- -- interface retrieved below.
+ -- Skip the first two access-to-dispatch-table pointers since they
+ -- leads to the primary dispatch table (predefined DT and user
+ -- defined DT). We are only concerned with the secondary dispatch
+ -- table pointers. Note that the access-to- dispatch-table pointer
+ -- corresponds to the first implemented interface retrieved below.
Iface_DT_Ptr :=
- Next_Elmt (First_Elmt (Access_Disp_Table (Tagged_Typ)));
+ Next_Elmt (Next_Elmt (First_Elmt (Access_Disp_Table (Tagged_Typ))));
- while Present (Iface_DT_Ptr) loop
- Thunk_Id :=
- Make_Defining_Identifier (Loc,
- Chars => New_Internal_Name ('T'));
+ while Present (Iface_DT_Ptr)
+ and then Ekind (Node (Iface_DT_Ptr)) = E_Constant
+ loop
+ pragma Assert (Has_Thunks (Node (Iface_DT_Ptr)));
+ Expand_Interface_Thunk (Prim, Thunk_Id, Thunk_Code);
+
+ if Present (Thunk_Code) then
+ Insert_Actions_After (N, New_List (
+ Thunk_Code,
+
+ Build_Set_Predefined_Prim_Op_Address (Loc,
+ Tag_Node =>
+ New_Reference_To (Node (Next_Elmt (Iface_DT_Ptr)), Loc),
+ Position => DT_Position (Prim),
+ Address_Node =>
+ Unchecked_Convert_To (RTE (RE_Prim_Ptr),
+ Make_Attribute_Reference (Loc,
+ Prefix => New_Reference_To (Thunk_Id, Loc),
+ Attribute_Name => Name_Unrestricted_Access))),
+
+ Build_Set_Predefined_Prim_Op_Address (Loc,
+ Tag_Node =>
+ New_Reference_To
+ (Node (Next_Elmt (Next_Elmt (Next_Elmt (Iface_DT_Ptr)))),
+ Loc),
+ Position => DT_Position (Prim),
+ Address_Node =>
+ Unchecked_Convert_To (RTE (RE_Prim_Ptr),
+ Make_Attribute_Reference (Loc,
+ Prefix => New_Reference_To (Prim, Loc),
+ Attribute_Name => Name_Unrestricted_Access)))));
+ end if;
- Insert_Actions (N, New_List (
- Expand_Interface_Thunk
- (N => Prim,
- Thunk_Alias => Prim,
- Thunk_Id => Thunk_Id),
-
- Build_Set_Predefined_Prim_Op_Address (Loc,
- Tag_Node =>
- New_Reference_To (Node (Iface_DT_Ptr), Loc),
- Position_Node =>
- Make_Integer_Literal (Loc, DT_Position (Prim)),
- Address_Node =>
- Make_Attribute_Reference (Loc,
- Prefix => New_Reference_To (Thunk_Id, Loc),
- Attribute_Name => Name_Address))));
+ -- Skip the tag of the predefined primitives dispatch table
Next_Elmt (Iface_DT_Ptr);
- end loop;
- end Register_Predefined_DT_Entry;
+ pragma Assert (Has_Thunks (Node (Iface_DT_Ptr)));
- -- Start of processing for Freeze_Subprogram
+ -- Skip the tag of the no-thunks dispatch table
- begin
- -- We assume that imported CPP primitives correspond with objects
- -- whose constructor is in the CPP side (and therefore we don't need
- -- to generate code to register them in the dispatch table).
+ Next_Elmt (Iface_DT_Ptr);
+ pragma Assert (not Has_Thunks (Node (Iface_DT_Ptr)));
- if Is_Imported (E)
- and then Convention (E) = Convention_CPP
- then
- return;
- end if;
+ -- Skip the tag of the predefined primitives no-thunks dispatch
+ -- table
- -- When a primitive is frozen, enter its name in the corresponding
- -- dispatch table. If the DTC_Entity field is not set this is an
- -- overridden primitive that can be ignored. We suppress the
- -- initialization of the dispatch table entry when Java_VM because
- -- the dispatching mechanism is handled internally by the JVM.
-
- if Is_Dispatching_Operation (E)
- and then not Is_Abstract_Subprogram (E)
- and then Present (DTC_Entity (E))
- and then not Java_VM
- and then not Is_CPP_Class (Scope (DTC_Entity (E)))
- then
- Check_Overriding_Operation (E);
+ Next_Elmt (Iface_DT_Ptr);
+ pragma Assert (not Has_Thunks (Node (Iface_DT_Ptr)));
- -- Ada 95 case: Register the subprogram in the primary dispatch table
+ Next_Elmt (Iface_DT_Ptr);
+ end loop;
+ end Register_Predefined_DT_Entry;
- -- Do not register the subprogram in the dispatch table if we are
- -- compiling under No_Dispatching_Calls restriction.
+ -- Local variables
- if not Restriction_Active (No_Dispatching_Calls) then
+ Subp : constant Entity_Id := Entity (N);
- if Ada_Version < Ada_05 then
- Insert_After (N,
- Fill_DT_Entry (Sloc (N), Prim => E));
+ -- Start of processing for Freeze_Subprogram
- -- Ada 2005 case: Register the subprogram in all the dispatch
- -- tables associated with the type
+ begin
+ -- We suppress the initialization of the dispatch table entry when
+ -- VM_Target because the dispatching mechanism is handled internally
+ -- by the VM.
+
+ if Is_Dispatching_Operation (Subp)
+ and then not Is_Abstract_Subprogram (Subp)
+ and then Present (DTC_Entity (Subp))
+ and then Present (Scope (DTC_Entity (Subp)))
+ and then Tagged_Type_Expansion
+ and then not Restriction_Active (No_Dispatching_Calls)
+ and then RTE_Available (RE_Tag)
+ then
+ declare
+ Typ : constant Entity_Id := Scope (DTC_Entity (Subp));
- else
- declare
- Typ : constant Entity_Id := Scope (DTC_Entity (E));
+ begin
+ -- Handle private overridden primitives
- begin
- if not Is_Interface (Typ)
- and then Is_Predefined_Dispatching_Operation (E)
- then
- Register_Predefined_DT_Entry (E);
- Insert_After (N, Fill_DT_Entry (Sloc (N), Prim => E));
+ if not Is_CPP_Class (Typ) then
+ Check_Overriding_Operation (Subp);
+ end if;
- -- There is no dispatch table associated with abstract
- -- interface types. Each type implementing interfaces will
- -- fill the associated secondary DT entries.
+ -- We assume that imported CPP primitives correspond with objects
+ -- whose constructor is in the CPP side; therefore we don't need
+ -- to generate code to register them in the dispatch table.
- elsif not Is_Interface (Typ)
- or else Present (Alias (E))
- then
- -- Ada 2005 (AI-251): Check if this entry corresponds
- -- with a subprogram that covers an abstract interface
- -- type.
+ if Is_CPP_Class (Typ) then
+ null;
- if Present (Abstract_Interface_Alias (E)) then
- Register_Interface_DT_Entry (N, E);
+ -- Handle CPP primitives found in derivations of CPP_Class types.
+ -- These primitives must have been inherited from some parent, and
+ -- there is no need to register them in the dispatch table because
+ -- Build_Inherit_Prims takes care of the initialization of these
+ -- slots.
- -- Common case: Primitive subprogram
+ elsif Is_Imported (Subp)
+ and then (Convention (Subp) = Convention_CPP
+ or else Convention (Subp) = Convention_C)
+ then
+ null;
- else
- -- Generate thunks for all the predefined operations
+ -- Generate code to register the primitive in non statically
+ -- allocated dispatch tables
- if Is_Predefined_Dispatching_Operation (E) then
- Register_Predefined_DT_Entry (E);
- end if;
+ elsif not Static_Dispatch_Tables
+ or else not
+ Is_Library_Level_Tagged_Type (Scope (DTC_Entity (Subp)))
+ then
+ -- When a primitive is frozen, enter its name in its dispatch
+ -- table slot.
- Insert_After (N,
- Fill_DT_Entry (Sloc (N), Prim => E));
- end if;
+ if not Is_Interface (Typ)
+ or else Present (Interface_Alias (Subp))
+ then
+ if Is_Predefined_Dispatching_Operation (Subp) then
+ Register_Predefined_DT_Entry (Subp);
end if;
- end;
+
+ Insert_Actions_After (N,
+ Register_Primitive (Loc, Prim => Subp));
+ end if;
end if;
- end if;
+ end;
end if;
- -- Mark functions that return by reference. Note that it cannot be
- -- part of the normal semantic analysis of the spec since the
- -- underlying returned type may not be known yet (for private types).
+ -- Mark functions that return by reference. Note that it cannot be part
+ -- of the normal semantic analysis of the spec since the underlying
+ -- returned type may not be known yet (for private types).
declare
- Typ : constant Entity_Id := Etype (E);
+ Typ : constant Entity_Id := Etype (Subp);
Utyp : constant Entity_Id := Underlying_Type (Typ);
-
begin
if Is_Inherently_Limited_Type (Typ) then
- Set_Returns_By_Ref (E);
-
- elsif Present (Utyp) and then CW_Or_Controlled_Type (Utyp) then
- Set_Returns_By_Ref (E);
+ Set_Returns_By_Ref (Subp);
+ elsif Present (Utyp) and then CW_Or_Has_Controlled_Part (Utyp) then
+ Set_Returns_By_Ref (Subp);
end if;
end;
end Freeze_Subprogram;
+ -----------------------
+ -- Is_Null_Procedure --
+ -----------------------
+
+ function Is_Null_Procedure (Subp : Entity_Id) return Boolean is
+ Decl : constant Node_Id := Unit_Declaration_Node (Subp);
+
+ begin
+ if Ekind (Subp) /= E_Procedure then
+ return False;
+
+ -- Check if this is a declared null procedure
+
+ elsif Nkind (Decl) = N_Subprogram_Declaration then
+ if not Null_Present (Specification (Decl)) then
+ return False;
+
+ elsif No (Body_To_Inline (Decl)) then
+ return False;
+
+ -- Check if the body contains only a null statement, followed by
+ -- the return statement added during expansion.
+
+ else
+ declare
+ Orig_Bod : constant Node_Id := Body_To_Inline (Decl);
+
+ Stat : Node_Id;
+ Stat2 : Node_Id;
+
+ begin
+ if Nkind (Orig_Bod) /= N_Subprogram_Body then
+ return False;
+ else
+ -- We must skip SCIL nodes because they are currently
+ -- implemented as special N_Null_Statement nodes.
+
+ Stat :=
+ First_Non_SCIL_Node
+ (Statements (Handled_Statement_Sequence (Orig_Bod)));
+ Stat2 := Next_Non_SCIL_Node (Stat);
+
+ return
+ Is_Empty_List (Declarations (Orig_Bod))
+ and then Nkind (Stat) = N_Null_Statement
+ and then
+ (No (Stat2)
+ or else
+ (Nkind (Stat2) = N_Simple_Return_Statement
+ and then No (Next (Stat2))));
+ end if;
+ end;
+ end if;
+
+ else
+ return False;
+ end if;
+ end Is_Null_Procedure;
+
-------------------------------------------
-- Make_Build_In_Place_Call_In_Allocator --
-------------------------------------------
Return_Obj_Access : Entity_Id;
begin
- if Nkind (Func_Call) = N_Qualified_Expression then
+ -- Step past qualification or unchecked conversion (the latter can occur
+ -- in cases of calls to 'Input).
+
+ if Nkind_In (Func_Call,
+ N_Qualified_Expression,
+ N_Unchecked_Type_Conversion)
+ then
Func_Call := Expression (Func_Call);
end if;
+ -- If the call has already been processed to add build-in-place actuals
+ -- then return. This should not normally occur in an allocator context,
+ -- but we add the protection as a defensive measure.
+
+ if Is_Expanded_Build_In_Place_Call (Func_Call) then
+ return;
+ end if;
+
+ -- Mark the call as processed as a build-in-place call
+
+ Set_Is_Expanded_Build_In_Place_Call (Func_Call);
+
Loc := Sloc (Function_Call);
if Is_Entity_Name (Name (Func_Call)) then
-- allocated on the caller side, and access to it is passed to the
-- function.
- if Is_Constrained (Result_Subt) then
+ -- Here and in related routines, we must examine the full view of the
+ -- type, because the view at the point of call may differ from that
+ -- that in the function body, and the expansion mechanism depends on
+ -- the characteristics of the full view.
+
+ if Is_Constrained (Underlying_Type (Result_Subt)) then
-- Replace the initialized allocator of form "new T'(Func (...))"
-- with an uninitialized allocator of form "new T", where T is the
-- is handled separately further below.
New_Allocator :=
- Make_Allocator (Loc, New_Reference_To (Result_Subt, Loc));
+ Make_Allocator (Loc,
+ Expression => New_Reference_To (Result_Subt, Loc));
+ Set_No_Initialization (New_Allocator);
+
+ -- Copy attributes to new allocator. Note that the new allocator
+ -- logically comes from source if the original one did, so copy the
+ -- relevant flag. This ensures proper treatment of the restriction
+ -- No_Implicit_Heap_Allocations in this case.
- Set_Storage_Pool (New_Allocator, Storage_Pool (Allocator));
+ Set_Storage_Pool (New_Allocator, Storage_Pool (Allocator));
Set_Procedure_To_Call (New_Allocator, Procedure_To_Call (Allocator));
- Set_No_Initialization (New_Allocator);
+ Set_Comes_From_Source (New_Allocator, Comes_From_Source (Allocator));
Rewrite (Allocator, New_Allocator);
Object_Definition => New_Reference_To (Acc_Type, Loc),
Expression => Relocate_Node (Allocator)));
+ -- When the function has a controlling result, an allocation-form
+ -- parameter must be passed indicating that the caller is allocating
+ -- the result object. This is needed because such a function can be
+ -- called as a dispatching operation and must be treated similarly
+ -- to functions with unconstrained result subtypes.
+
+ Add_Alloc_Form_Actual_To_Build_In_Place_Call
+ (Func_Call, Function_Id, Alloc_Form => Caller_Allocation);
+
+ Add_Final_List_Actual_To_Build_In_Place_Call
+ (Func_Call, Function_Id, Acc_Type);
+
+ Add_Task_Actuals_To_Build_In_Place_Call
+ (Func_Call, Function_Id, Master_Actual => Master_Id (Acc_Type));
+
-- Add an implicit actual to the function call that provides access
-- to the allocated object. An unchecked conversion to the (specific)
-- result subtype of the function is inserted to handle cases where
-- the access type of the allocator has a class-wide designated type.
- Add_Final_List_Actual_To_Build_In_Place_Call (Func_Call, Function_Id);
- Add_Task_Actuals_To_Build_In_Place_Call
- (Func_Call, Function_Id, Master_Actual => Master_Id (Acc_Type));
Add_Access_Actual_To_Build_In_Place_Call
(Func_Call,
Function_Id,
-- operations. ???
else
+
-- Pass an allocation parameter indicating that the function should
-- allocate its result on the heap.
Add_Alloc_Form_Actual_To_Build_In_Place_Call
(Func_Call, Function_Id, Alloc_Form => Global_Heap);
- -- The caller does not provide the return object in this case, so we
- -- have to pass null for the object access actual.
+ Add_Final_List_Actual_To_Build_In_Place_Call
+ (Func_Call, Function_Id, Acc_Type);
- Add_Final_List_Actual_To_Build_In_Place_Call (Func_Call, Function_Id);
Add_Task_Actuals_To_Build_In_Place_Call
(Func_Call, Function_Id, Master_Actual => Master_Id (Acc_Type));
+
+ -- The caller does not provide the return object in this case, so we
+ -- have to pass null for the object access actual.
+
Add_Access_Actual_To_Build_In_Place_Call
(Func_Call, Function_Id, Return_Object => Empty);
end if;
Return_Obj_Decl : Entity_Id;
begin
- if Nkind (Func_Call) = N_Qualified_Expression then
+ -- Step past qualification or unchecked conversion (the latter can occur
+ -- in cases of calls to 'Input).
+
+ if Nkind_In (Func_Call, N_Qualified_Expression,
+ N_Unchecked_Type_Conversion)
+ then
Func_Call := Expression (Func_Call);
end if;
+ -- If the call has already been processed to add build-in-place actuals
+ -- then return. One place this can occur is for calls to build-in-place
+ -- functions that occur within a call to a protected operation, where
+ -- due to rewriting and expansion of the protected call there can be
+ -- more than one call to Expand_Actuals for the same set of actuals.
+
+ if Is_Expanded_Build_In_Place_Call (Func_Call) then
+ return;
+ end if;
+
+ -- Mark the call as processed as a build-in-place call
+
+ Set_Is_Expanded_Build_In_Place_Call (Func_Call);
+
Loc := Sloc (Function_Call);
if Is_Entity_Name (Name (Func_Call)) then
-- When the result subtype is constrained, an object of the subtype is
-- declared and an access value designating it is passed as an actual.
- if Is_Constrained (Result_Subt) then
+ if Is_Constrained (Underlying_Type (Result_Subt)) then
-- Create a temporary object to hold the function result
Insert_Action (Func_Call, Return_Obj_Decl);
- -- Add an implicit actual to the function call that provides access
- -- to the caller's return object.
+ -- When the function has a controlling result, an allocation-form
+ -- parameter must be passed indicating that the caller is allocating
+ -- the result object. This is needed because such a function can be
+ -- called as a dispatching operation and must be treated similarly
+ -- to functions with unconstrained result subtypes.
+
+ Add_Alloc_Form_Actual_To_Build_In_Place_Call
+ (Func_Call, Function_Id, Alloc_Form => Caller_Allocation);
+
+ Add_Final_List_Actual_To_Build_In_Place_Call
+ (Func_Call, Function_Id, Acc_Type => Empty);
- Add_Final_List_Actual_To_Build_In_Place_Call (Func_Call, Function_Id);
Add_Task_Actuals_To_Build_In_Place_Call
(Func_Call, Function_Id, Make_Identifier (Loc, Name_uMaster));
+
+ -- Add an implicit actual to the function call that provides access
+ -- to the caller's return object.
+
Add_Access_Actual_To_Build_In_Place_Call
(Func_Call, Function_Id, New_Reference_To (Return_Obj_Id, Loc));
-- scope is established to ensure eventual cleanup of the result.
else
+
-- Pass an allocation parameter indicating that the function should
-- allocate its result on the secondary stack.
Add_Alloc_Form_Actual_To_Build_In_Place_Call
(Func_Call, Function_Id, Alloc_Form => Secondary_Stack);
- -- Pass a null value to the function since no return object is
- -- available on the caller side.
+ Add_Final_List_Actual_To_Build_In_Place_Call
+ (Func_Call, Function_Id, Acc_Type => Empty);
- Add_Final_List_Actual_To_Build_In_Place_Call (Func_Call, Function_Id);
Add_Task_Actuals_To_Build_In_Place_Call
(Func_Call, Function_Id, Make_Identifier (Loc, Name_uMaster));
+
+ -- Pass a null value to the function since no return object is
+ -- available on the caller side.
+
Add_Access_Actual_To_Build_In_Place_Call
(Func_Call, Function_Id, Empty);
end if;
end Make_Build_In_Place_Call_In_Anonymous_Context;
- ---------------------------------------------------
+ --------------------------------------------
-- Make_Build_In_Place_Call_In_Assignment --
- ---------------------------------------------------
+ --------------------------------------------
procedure Make_Build_In_Place_Call_In_Assignment
(Assign : Node_Id;
Function_Call : Node_Id)
is
- Lhs : constant Node_Id := Name (Assign);
- Loc : Source_Ptr;
- Func_Call : Node_Id := Function_Call;
- Function_Id : Entity_Id;
- Result_Subt : Entity_Id;
- Ref_Type : Entity_Id;
- Ptr_Typ_Decl : Node_Id;
- Def_Id : Entity_Id;
- New_Expr : Node_Id;
+ Lhs : constant Node_Id := Name (Assign);
+ Func_Call : Node_Id := Function_Call;
+ Func_Id : Entity_Id;
+ Loc : Source_Ptr;
+ Obj_Decl : Node_Id;
+ Obj_Id : Entity_Id;
+ Ptr_Typ : Entity_Id;
+ Ptr_Typ_Decl : Node_Id;
+ Result_Subt : Entity_Id;
+ Target : Node_Id;
begin
- if Nkind (Func_Call) = N_Qualified_Expression then
+ -- Step past qualification or unchecked conversion (the latter can occur
+ -- in cases of calls to 'Input).
+
+ if Nkind_In (Func_Call, N_Qualified_Expression,
+ N_Unchecked_Type_Conversion)
+ then
Func_Call := Expression (Func_Call);
end if;
+ -- If the call has already been processed to add build-in-place actuals
+ -- then return. This should not normally occur in an assignment context,
+ -- but we add the protection as a defensive measure.
+
+ if Is_Expanded_Build_In_Place_Call (Func_Call) then
+ return;
+ end if;
+
+ -- Mark the call as processed as a build-in-place call
+
+ Set_Is_Expanded_Build_In_Place_Call (Func_Call);
+
Loc := Sloc (Function_Call);
if Is_Entity_Name (Name (Func_Call)) then
- Function_Id := Entity (Name (Func_Call));
+ Func_Id := Entity (Name (Func_Call));
elsif Nkind (Name (Func_Call)) = N_Explicit_Dereference then
- Function_Id := Etype (Name (Func_Call));
+ Func_Id := Etype (Name (Func_Call));
else
raise Program_Error;
end if;
- Result_Subt := Etype (Function_Id);
+ Result_Subt := Etype (Func_Id);
-- When the result subtype is unconstrained, an additional actual must
-- be passed to indicate that the caller is providing the return object.
+ -- This parameter must also be passed when the called function has a
+ -- controlling result, because dispatching calls to the function needs
+ -- to be treated effectively the same as calls to class-wide functions.
- if not Is_Constrained (Result_Subt) then
- Add_Alloc_Form_Actual_To_Build_In_Place_Call
- (Func_Call, Function_Id, Alloc_Form => Caller_Allocation);
+ Add_Alloc_Form_Actual_To_Build_In_Place_Call
+ (Func_Call, Func_Id, Alloc_Form => Caller_Allocation);
+
+ -- If Lhs is a selected component, then pass it along so that its prefix
+ -- object will be used as the source of the finalization list.
+
+ if Nkind (Lhs) = N_Selected_Component then
+ Add_Final_List_Actual_To_Build_In_Place_Call
+ (Func_Call, Func_Id, Acc_Type => Empty, Sel_Comp => Lhs);
+ else
+ Add_Final_List_Actual_To_Build_In_Place_Call
+ (Func_Call, Func_Id, Acc_Type => Empty);
end if;
+ Add_Task_Actuals_To_Build_In_Place_Call
+ (Func_Call, Func_Id, Make_Identifier (Loc, Name_uMaster));
+
-- Add an implicit actual to the function call that provides access to
-- the caller's return object.
- Add_Final_List_Actual_To_Build_In_Place_Call (Func_Call, Function_Id);
- Add_Task_Actuals_To_Build_In_Place_Call
- (Func_Call, Function_Id, Make_Identifier (Loc, Name_uMaster));
Add_Access_Actual_To_Build_In_Place_Call
(Func_Call,
- Function_Id,
+ Func_Id,
Make_Unchecked_Type_Conversion (Loc,
Subtype_Mark => New_Reference_To (Result_Subt, Loc),
Expression => Relocate_Node (Lhs)));
-- Create an access type designating the function's result subtype
- Ref_Type :=
+ Ptr_Typ :=
Make_Defining_Identifier (Loc, New_Internal_Name ('A'));
Ptr_Typ_Decl :=
Make_Full_Type_Declaration (Loc,
- Defining_Identifier => Ref_Type,
+ Defining_Identifier => Ptr_Typ,
Type_Definition =>
Make_Access_To_Object_Definition (Loc,
All_Present => True,
Subtype_Indication =>
New_Reference_To (Result_Subt, Loc)));
-
Insert_After_And_Analyze (Assign, Ptr_Typ_Decl);
-- Finally, create an access object initialized to a reference to the
-- function call.
- Def_Id :=
- Make_Defining_Identifier (Loc,
- Chars => New_Internal_Name ('R'));
- Set_Etype (Def_Id, Ref_Type);
-
- New_Expr :=
- Make_Reference (Loc,
- Prefix => Relocate_Node (Func_Call));
+ Obj_Id := Make_Defining_Identifier (Loc, New_Internal_Name ('R'));
+ Set_Etype (Obj_Id, Ptr_Typ);
- Insert_After_And_Analyze (Ptr_Typ_Decl,
+ Obj_Decl :=
Make_Object_Declaration (Loc,
- Defining_Identifier => Def_Id,
- Object_Definition => New_Reference_To (Ref_Type, Loc),
- Expression => New_Expr));
+ Defining_Identifier => Obj_Id,
+ Object_Definition =>
+ New_Reference_To (Ptr_Typ, Loc),
+ Expression =>
+ Make_Reference (Loc,
+ Prefix => Relocate_Node (Func_Call)));
+ Insert_After_And_Analyze (Ptr_Typ_Decl, Obj_Decl);
Rewrite (Assign, Make_Null_Statement (Loc));
+
+ -- Retrieve the target of the assignment
+
+ if Nkind (Lhs) = N_Selected_Component then
+ Target := Selector_Name (Lhs);
+ elsif Nkind (Lhs) = N_Type_Conversion then
+ Target := Expression (Lhs);
+ else
+ Target := Lhs;
+ end if;
+
+ -- If we are assigning to a return object or this is an expression of
+ -- an extension aggregate, the target should either be an identifier
+ -- or a simple expression. All other cases imply a different scenario.
+
+ if Nkind (Target) in N_Has_Entity then
+ Target := Entity (Target);
+ else
+ return;
+ end if;
+
+ -- When the target of the assignment is a return object of an enclosing
+ -- build-in-place function and also requires finalization, the list
+ -- generated for the assignment must be moved to that of the enclosing
+ -- function.
+
+ -- function Enclosing_BIP_Function return Ctrl_Typ is
+ -- begin
+ -- return (Ctrl_Parent_Part => BIP_Function with ...);
+ -- end Enclosing_BIP_Function;
+
+ if Is_Return_Object (Target)
+ and then Needs_Finalization (Etype (Target))
+ and then Needs_Finalization (Result_Subt)
+ then
+ declare
+ Obj_List : constant Node_Id := Find_Final_List (Obj_Id);
+ Encl_List : Node_Id;
+ Encl_Scop : Entity_Id;
+
+ begin
+ Encl_Scop := Scope (Target);
+
+ -- Locate the scope of the extended return statement
+
+ while Present (Encl_Scop)
+ and then Ekind (Encl_Scop) /= E_Return_Statement
+ loop
+ Encl_Scop := Scope (Encl_Scop);
+ end loop;
+
+ -- A return object should always be enclosed by a return statement
+ -- scope at some level.
+
+ pragma Assert (Present (Encl_Scop));
+
+ Encl_List :=
+ Make_Attribute_Reference (Loc,
+ Prefix =>
+ New_Reference_To (
+ Finalization_Chain_Entity (Encl_Scop), Loc),
+ Attribute_Name => Name_Unrestricted_Access);
+
+ -- Generate a call to move final list
+
+ Insert_After_And_Analyze (Obj_Decl,
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (RTE (RE_Move_Final_List), Loc),
+ Parameter_Associations => New_List (Obj_List, Encl_List)));
+ end;
+ end if;
end Make_Build_In_Place_Call_In_Assignment;
----------------------------------------------------
Loc : Source_Ptr;
Obj_Def_Id : constant Entity_Id :=
Defining_Identifier (Object_Decl);
+
Func_Call : Node_Id := Function_Call;
Function_Id : Entity_Id;
Result_Subt : Entity_Id;
Pass_Caller_Acc : Boolean := False;
begin
- if Nkind (Func_Call) = N_Qualified_Expression then
+ -- Step past qualification or unchecked conversion (the latter can occur
+ -- in cases of calls to 'Input).
+
+ if Nkind_In (Func_Call, N_Qualified_Expression,
+ N_Unchecked_Type_Conversion)
+ then
Func_Call := Expression (Func_Call);
end if;
+ -- If the call has already been processed to add build-in-place actuals
+ -- then return. This should not normally occur in an object declaration,
+ -- but we add the protection as a defensive measure.
+
+ if Is_Expanded_Build_In_Place_Call (Func_Call) then
+ return;
+ end if;
+
+ -- Mark the call as processed as a build-in-place call
+
+ Set_Is_Expanded_Build_In_Place_Call (Func_Call);
+
Loc := Sloc (Function_Call);
if Is_Entity_Name (Name (Func_Call)) then
-- to the (specific) result type of the function is inserted to handle
-- the case where the object is declared with a class-wide type.
- if Is_Constrained (Result_Subt) then
+ if Is_Constrained (Underlying_Type (Result_Subt)) then
Caller_Object :=
Make_Unchecked_Type_Conversion (Loc,
Subtype_Mark => New_Reference_To (Result_Subt, Loc),
Expression => New_Reference_To (Obj_Def_Id, Loc));
+ -- When the function has a controlling result, an allocation-form
+ -- parameter must be passed indicating that the caller is allocating
+ -- the result object. This is needed because such a function can be
+ -- called as a dispatching operation and must be treated similarly
+ -- to functions with unconstrained result subtypes.
+
+ Add_Alloc_Form_Actual_To_Build_In_Place_Call
+ (Func_Call, Function_Id, Alloc_Form => Caller_Allocation);
+
-- If the function's result subtype is unconstrained and the object is
-- a return object of an enclosing build-in-place function, then the
-- implicit build-in-place parameters of the enclosing function must be
- -- passed along to the called function.
-
- elsif Nkind (Parent (Object_Decl)) = N_Extended_Return_Statement then
+ -- passed along to the called function. (Unfortunately, this won't cover
+ -- the case of extension aggregates where the ancestor part is a build-
+ -- in-place unconstrained function call that should be passed along the
+ -- caller's parameters. Currently those get mishandled by reassigning
+ -- the result of the call to the aggregate return object, when the call
+ -- result should really be directly built in place in the aggregate and
+ -- not built in a temporary. ???)
+
+ elsif Is_Return_Object (Defining_Identifier (Object_Decl)) then
Pass_Caller_Acc := True;
Enclosing_Func := Enclosing_Subprogram (Obj_Def_Id);
-- Otherwise, when the enclosing function has an unconstrained result
-- type, the BIP_Alloc_Form formal of the enclosing function must be
- -- passed long to the callee.
+ -- passed along to the callee.
else
Add_Alloc_Form_Actual_To_Build_In_Place_Call
Establish_Transient_Scope (Object_Decl, Sec_Stack => True);
end if;
- Add_Final_List_Actual_To_Build_In_Place_Call (Func_Call, Function_Id);
+ Add_Final_List_Actual_To_Build_In_Place_Call
+ (Func_Call, Function_Id, Acc_Type => Empty);
+
if Nkind (Parent (Object_Decl)) = N_Extended_Return_Statement
and then Has_Task (Result_Subt)
then
Enclosing_Func := Enclosing_Subprogram (Obj_Def_Id);
+
+ -- Here we're passing along the master that was passed in to this
+ -- function.
+
Add_Task_Actuals_To_Build_In_Place_Call
(Func_Call, Function_Id,
Master_Actual =>
New_Reference_To
(Build_In_Place_Formal (Enclosing_Func, BIP_Master), Loc));
- -- Here we're passing along the master that was passed in to this
- -- function.
+
else
Add_Task_Actuals_To_Build_In_Place_Call
(Func_Call, Function_Id, Make_Identifier (Loc, Name_uMaster));
end if;
+
Add_Access_Actual_To_Build_In_Place_Call
(Func_Call, Function_Id, Caller_Object, Is_Access => Pass_Caller_Acc);
-- the object declaration is rewritten to be a renaming of a dereference
-- of the access object.
- if Is_Constrained (Result_Subt) then
+ if Is_Constrained (Underlying_Type (Result_Subt)) then
Insert_After_And_Analyze (Object_Decl, Ptr_Typ_Decl);
else
- Insert_Before_And_Analyze (Object_Decl, Ptr_Typ_Decl);
+ Insert_Action (Object_Decl, Ptr_Typ_Decl);
end if;
-- Finally, create an access object initialized to a reference to the
Object_Definition => New_Reference_To (Ref_Type, Loc),
Expression => New_Expr));
- if Is_Constrained (Result_Subt) then
+ if Is_Constrained (Underlying_Type (Result_Subt)) then
Set_Expression (Object_Decl, Empty);
Set_No_Initialization (Object_Decl);
-- ensure the correct replacement of the object declaration by the
-- object renaming declaration to avoid homograph conflicts (since
-- the object declaration's defining identifier was already entered
- -- in current scope).
+ -- in current scope). The Next_Entity links of the two entities also
+ -- have to be swapped since the entities are part of the return
+ -- scope's entity list and the list structure would otherwise be
+ -- corrupted. Finally, the homonym chain must be preserved as well.
+
+ declare
+ Renaming_Def_Id : constant Entity_Id :=
+ Defining_Identifier (Object_Decl);
+ Next_Entity_Temp : constant Entity_Id :=
+ Next_Entity (Renaming_Def_Id);
+ begin
+ Set_Chars (Renaming_Def_Id, Chars (Obj_Def_Id));
+
+ -- Swap next entity links in preparation for exchanging entities
+
+ Set_Next_Entity (Renaming_Def_Id, Next_Entity (Obj_Def_Id));
+ Set_Next_Entity (Obj_Def_Id, Next_Entity_Temp);
+ Set_Homonym (Renaming_Def_Id, Homonym (Obj_Def_Id));
- Set_Chars (Defining_Identifier (Object_Decl), Chars (Obj_Def_Id));
- Exchange_Entities (Defining_Identifier (Object_Decl), Obj_Def_Id);
+ Exchange_Entities (Renaming_Def_Id, Obj_Def_Id);
+ end;
end if;
-- If the object entity has a class-wide Etype, then we need to change
-- it to the result subtype of the function call, because otherwise the
- -- object will be class-wide without an explicit intialization and won't
- -- be allocated properly by the back end. It seems unclean to make such
- -- a revision to the type at this point, and we should try to improve
- -- this treatment when build-in-place functions with class-wide results
- -- are implemented. ???
+ -- object will be class-wide without an explicit initialization and
+ -- won't be allocated properly by the back end. It seems unclean to make
+ -- such a revision to the type at this point, and we should try to
+ -- improve this treatment when build-in-place functions with class-wide
+ -- results are implemented. ???
if Is_Class_Wide_Type (Etype (Defining_Identifier (Object_Decl))) then
Set_Etype (Defining_Identifier (Object_Decl), Result_Subt);
end if;
end Make_Build_In_Place_Call_In_Object_Declaration;
- ---------------------------------
- -- Register_Interface_DT_Entry --
- ---------------------------------
+ --------------------------
+ -- Needs_BIP_Final_List --
+ --------------------------
- procedure Register_Interface_DT_Entry
- (Related_Nod : Node_Id;
- Prim : Entity_Id)
- is
- Loc : constant Source_Ptr := Sloc (Prim);
- Iface_Typ : Entity_Id;
- Tagged_Typ : Entity_Id;
- Thunk_Id : Entity_Id;
+ function Needs_BIP_Final_List (E : Entity_Id) return Boolean is
+ pragma Assert (Is_Build_In_Place_Function (E));
+ Result_Subt : constant Entity_Id := Underlying_Type (Etype (E));
begin
- -- Nothing to do if the run-time does not support abstract interfaces
-
- if not (RTE_Available (RE_Interface_Tag)) then
- return;
- end if;
-
- Tagged_Typ := Find_Dispatching_Type (Alias (Prim));
- Iface_Typ := Find_Dispatching_Type (Abstract_Interface_Alias (Prim));
-
- -- Generate the code of the thunk only if the abstract interface type is
- -- not an immediate ancestor of Tagged_Type; otherwise the dispatch
- -- table associated with the interface is the primary dispatch table.
-
- pragma Assert (Is_Interface (Iface_Typ));
-
- if not Is_Parent (Iface_Typ, Tagged_Typ) then
- Thunk_Id :=
- Make_Defining_Identifier (Loc,
- Chars => New_Internal_Name ('T'));
-
- Insert_Actions (Related_Nod, New_List (
- Expand_Interface_Thunk
- (N => Prim,
- Thunk_Alias => Alias (Prim),
- Thunk_Id => Thunk_Id),
-
- Fill_Secondary_DT_Entry (Sloc (Prim),
- Prim => Prim,
- Iface_DT_Ptr => Find_Interface_ADT (Tagged_Typ, Iface_Typ),
- Thunk_Id => Thunk_Id)));
- end if;
- end Register_Interface_DT_Entry;
+ -- We need the BIP_Final_List if the result type needs finalization. We
+ -- also need it for tagged types, even if not class-wide, because some
+ -- type extension might need finalization, and all overriding functions
+ -- must have the same calling conventions. However, if there is a
+ -- pragma Restrictions (No_Finalization), we never need this parameter.
+
+ return (Needs_Finalization (Result_Subt)
+ or else Is_Tagged_Type (Underlying_Type (Result_Subt)))
+ and then not Restriction_Active (No_Finalization);
+ end Needs_BIP_Final_List;
end Exp_Ch6;
OSDN Git Service
