-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2004, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2007, 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- --
-- 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, 59 Temple Place - Suite 330, Boston, --
--- MA 02111-1307, USA. --
+-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
+-- Boston, MA 02110-1301, USA. --
-- --
-- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. --
with Exp_Ch11; use Exp_Ch11;
with Exp_Ch6; use Exp_Ch6;
with Exp_Dbug; use Exp_Dbug;
+with Exp_Sel; use Exp_Sel;
with Exp_Smem; use Exp_Smem;
with Exp_Tss; use Exp_Tss;
with Exp_Util; use Exp_Util;
with Freeze; use Freeze;
with Hostparm;
-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_Ch6;
+with Sem_Ch6; use Sem_Ch6;
with Sem_Ch8; use Sem_Ch8;
with Sem_Ch11; use Sem_Ch11;
with Sem_Elab; use Sem_Elab;
with Sinfo; use Sinfo;
with Snames; use Snames;
with Stand; use Stand;
+with Targparm; use Targparm;
with Tbuild; use Tbuild;
-with Types; use Types;
with Uintp; use Uintp;
-with Opt;
package body Exp_Ch9 is
+ -- The following constant establishes the upper bound for the index of
+ -- an entry family. It is used to limit the allocated size of protected
+ -- types with defaulted discriminant of an integer type, when the bound
+ -- of some entry family depends on a discriminant. The limitation to
+ -- entry families of 128K should be reasonable in all cases, and is a
+ -- documented implementation restriction. It will be lifted when protected
+ -- entry families are re-implemented as a single ordered queue.
+
+ Entry_Family_Bound : constant Int := 2**16;
+
-----------------------
-- Local Subprograms --
-----------------------
-- the expression computed by this function uses the discriminants
-- of the target task.
- function Index_Constant_Declaration
- (N : Node_Id;
- Index_Id : Entity_Id;
- Prot : Entity_Id) return List_Id;
- -- For an entry family and its barrier function, we define a local entity
- -- that maps the index in the call into the entry index into the object:
- --
- -- I : constant Index_Type := Index_Type'Val (
- -- E - <<index of first family member>> +
- -- Protected_Entry_Index (Index_Type'Pos (Index_Type'First)));
-
procedure Add_Object_Pointer
(Decls : List_Id;
Pid : Entity_Id;
-- of the System.Address pointer passed to entry barrier functions
-- and entry body procedures.
- function Build_Accept_Body (Astat : Node_Id) return Node_Id;
+ procedure Add_Formal_Renamings
+ (Spec : Node_Id;
+ Decls : List_Id;
+ Ent : Entity_Id;
+ Loc : Source_Ptr);
+ -- Create renaming declarations for the formals, inside the procedure
+ -- that implements an entry body. The renamings make the original names
+ -- of the formals accessible to gdb, and serve no other purpose.
+ -- Spec is the specification of the procedure being built.
+ -- Decls is the list of declarations to be enhanced.
+ -- Ent is the entity for the original entry body.
+
+ function Build_Accept_Body (Astat : Node_Id) return Node_Id;
-- Transform accept statement into a block with added exception handler.
-- Used both for simple accept statements and for accept alternatives in
-- select statements. Astat is the accept statement.
function Build_Barrier_Function
- (N : Node_Id;
- Ent : Entity_Id;
- Pid : Node_Id) return Node_Id;
+ (N : Node_Id;
+ Ent : Entity_Id;
+ Pid : Node_Id) return Node_Id;
-- Build the function body returning the value of the barrier expression
-- for the specified entry body.
-- Build a specification for a function implementing
-- the protected entry barrier of the specified entry body.
- function Build_Corresponding_Record
- (N : Node_Id;
- Ctyp : Node_Id;
- Loc : Source_Ptr) return Node_Id;
- -- Common to tasks and protected types. Copy discriminant specifications,
- -- build record declaration. N is the type declaration, Ctyp is the
- -- concurrent entity (task type or protected type).
-
function Build_Entry_Count_Expression
(Concurrent_Type : Node_Id;
Component_List : List_Id;
-- of the range of each entry family. A single array with that size is
-- allocated for each concurrent object of the type.
+ function Build_Parameter_Block
+ (Loc : Source_Ptr;
+ Actuals : List_Id;
+ Formals : List_Id;
+ Decls : List_Id) return Entity_Id;
+ -- Generate an access type for each actual parameter in the list Actuals.
+ -- Cleate an encapsulating record that contains all the actuals and return
+ -- its type. Generate:
+ -- type Ann1 is access all <actual1-type>
+ -- ...
+ -- type AnnN is access all <actualN-type>
+ -- type Pnn is record
+ -- <formal1> : Ann1;
+ -- ...
+ -- <formalN> : AnnN;
+ -- end record;
+
+ function Build_Wrapper_Body
+ (Loc : Source_Ptr;
+ Proc_Nam : Entity_Id;
+ Obj_Typ : Entity_Id;
+ Formals : List_Id) return Node_Id;
+ -- Ada 2005 (AI-345): Build the body that wraps a primitive operation
+ -- associated with a protected or task type. This is required to implement
+ -- dispatching calls through interfaces. Proc_Nam is the entry name to be
+ -- wrapped, Obj_Typ is the type of the newly added formal parameter to
+ -- handle object notation, Formals are the original entry formals that will
+ -- be explicitly replicated.
+
+ function Build_Wrapper_Spec
+ (Loc : Source_Ptr;
+ Proc_Nam : Entity_Id;
+ Obj_Typ : Entity_Id;
+ Formals : List_Id) return Node_Id;
+ -- Ada 2005 (AI-345): Build the specification of a primitive operation
+ -- associated with a protected or task type. This is required implement
+ -- dispatching calls through interfaces. Proc_Nam is the entry name to be
+ -- wrapped, Obj_Typ is the type of the newly added formal parameter to
+ -- handle object notation, Formals are the original entry formals that will
+ -- be explicitly replicated.
+
function Build_Find_Body_Index (Typ : Entity_Id) return Node_Id;
-- Build the function that translates the entry index in the call
-- (which depends on the size of entry families) into an index into the
Pid : Node_Id;
N_Op_Spec : Node_Id) return Node_Id;
-- This function is used to construct the protected version of a protected
- -- subprogram. Its statement sequence first defers abortion, then locks
+ -- subprogram. Its statement sequence first defers abort, then locks
-- the associated protected object, and then enters a block that contains
-- a call to the unprotected version of the subprogram (for details, see
-- Build_Unprotected_Subprogram_Body). This block statement requires
-- The object is a limited record and therefore a by_reference type.
function Build_Selected_Name
- (Prefix, Selector : Name_Id;
- Append_Char : Character := ' ') return Name_Id;
+ (Prefix : Entity_Id;
+ Selector : Entity_Id;
+ Append_Char : Character := ' ') return Name_Id;
-- Build a name in the form of Prefix__Selector, with an optional
-- character appended. This is used for internal subprograms generated
- -- for operations of protected types, including barrier functions. In
- -- order to simplify the work of the debugger, the prefix includes the
- -- characters PT. For the subprograms generated for entry bodies and
- -- entry barriers, the generated name includes a sequence number that
- -- makes names unique in the presence of entry overloading. This is
- -- necessary because entry body procedures and barrier functions all
- -- have the same signature.
+ -- for operations of protected types, including barrier functions.
+ -- For the subprograms generated for entry bodies and entry barriers,
+ -- the generated name includes a sequence number that makes names
+ -- unique in the presence of entry overloading. This is necessary
+ -- because entry body procedures and barrier functions all have the
+ -- same signature.
procedure Build_Simple_Entry_Call
(N : Node_Id;
-- For each entry family in a concurrent type, create an anonymous array
-- type of the right size, and add a component to the corresponding_record.
+ function Copy_Result_Type (Res : Node_Id) return Node_Id;
+ -- Copy the result type of a function specification, when building the
+ -- internal operation corresponding to a protected function, or when
+ -- expanding an access to protected function. If the result is an anonymous
+ -- access to subprogram itself, we need to create a new signature with the
+ -- same parameter names and the same resolved types, but with new entities
+ -- for the formals.
+
function Family_Offset
(Loc : Source_Ptr;
Hi : Node_Id;
Lo : Node_Id;
- Ttyp : Entity_Id) return Node_Id;
+ Ttyp : Entity_Id;
+ Cap : Boolean) return Node_Id;
-- Compute (Hi - Lo) for two entry family indices. Hi is the index in
-- an accept statement, or the upper bound in the discrete subtype of
-- an entry declaration. Lo is the corresponding lower bound. Ttyp is
- -- the concurrent type of the entry.
+ -- the concurrent type of the entry. If Cap is true, the result is
+ -- capped according to Entry_Family_Bound.
function Family_Size
(Loc : Source_Ptr;
Hi : Node_Id;
Lo : Node_Id;
- Ttyp : Entity_Id) return Node_Id;
+ Ttyp : Entity_Id;
+ Cap : Boolean) return Node_Id;
-- Compute (Hi - Lo) + 1 Max 0, to determine the number of entries in
-- a family, and handle properly the superflat case. This is equivalent
-- to the use of 'Length on the index type, but must use Family_Offset
-- to handle properly the case of bounds that depend on discriminants.
+ -- If Cap is true, the result is capped according to Entry_Family_Bound.
+
+ procedure Extract_Dispatching_Call
+ (N : Node_Id;
+ Call_Ent : out Entity_Id;
+ Object : out Entity_Id;
+ Actuals : out List_Id;
+ Formals : out List_Id);
+ -- Given a dispatching call, extract the entity of the name of the call,
+ -- its object parameter, its actual parameters and the formal parameters
+ -- of the overriden interface-level version.
procedure Extract_Entry
(N : Node_Id;
-- when P is Name_uPriority, the call will also find Interrupt_Priority.
-- ??? Should be implemented with the rep item chain mechanism.
+ function Index_Constant_Declaration
+ (N : Node_Id;
+ Index_Id : Entity_Id;
+ Prot : Entity_Id) return List_Id;
+ -- For an entry family and its barrier function, we define a local entity
+ -- that maps the index in the call into the entry index into the object:
+ --
+ -- I : constant Index_Type := Index_Type'Val (
+ -- E - <<index of first family member>> +
+ -- Protected_Entry_Index (Index_Type'Pos (Index_Type'First)));
+
+ function Is_Potentially_Large_Family
+ (Base_Index : Entity_Id;
+ Conctyp : Entity_Id;
+ Lo : Node_Id;
+ Hi : Node_Id) return Boolean;
+
+ function Parameter_Block_Pack
+ (Loc : Source_Ptr;
+ Blk_Typ : Entity_Id;
+ Actuals : List_Id;
+ Formals : List_Id;
+ Decls : List_Id;
+ Stmts : List_Id) return Entity_Id;
+ -- Set the components of the generated parameter block with the values of
+ -- the actual parameters. Generate aliased temporaries to capture the
+ -- values for types that are passed by copy. Otherwise generate a reference
+ -- to the actual's value. Return the address of the aggregate block.
+ -- Generate:
+ -- Jnn1 : alias <formal-type1>;
+ -- Jnn1 := <actual1>;
+ -- ...
+ -- P : Blk_Typ := (
+ -- Jnn1'unchecked_access;
+ -- <actual2>'reference;
+ -- ...);
+
+ function Parameter_Block_Unpack
+ (Loc : Source_Ptr;
+ P : Entity_Id;
+ Actuals : List_Id;
+ Formals : List_Id) return List_Id;
+ -- Retrieve the values of the components from the parameter block and
+ -- assign then to the original actual parameters. Generate:
+ -- <actual1> := P.<formal1>;
+ -- ...
+ -- <actualN> := P.<formalN>;
+
procedure Update_Prival_Subtypes (N : Node_Id);
-- The actual subtypes of the privals will differ from the type of the
-- private declaration in the original protected type, if the protected
S : Node_Id;
function Actual_Family_Offset (Hi, Lo : Node_Id) return Node_Id;
- -- Compute difference between bounds of entry family.
+ -- Compute difference between bounds of entry family
--------------------------
-- Actual_Family_Offset --
-- Start of processing for Actual_Index_Expression
begin
- -- The queues of entries and entry families appear in textual
- -- order in the associated record. The entry index is computed as
- -- the sum of the number of queues for all entries that precede the
- -- designated one, to which is added the index expression, if this
- -- expression denotes a member of a family.
+ -- The queues of entries and entry families appear in textual order in
+ -- the associated record. The entry index is computed as the sum of the
+ -- number of queues for all entries that precede the designated one, to
+ -- which is added the index expression, if this expression denotes a
+ -- member of a family.
- -- The following is a place holder for the count of simple entries.
+ -- The following is a place holder for the count of simple entries
Num := Make_Integer_Literal (Sloc, 1);
- -- We construct an expression which is a series of addition
- -- operations. See comments in Entry_Index_Expression, which is
- -- identical in structure.
+ -- We construct an expression which is a series of addition operations.
+ -- See comments in Entry_Index_Expression, which is identical in
+ -- structure.
if Present (Index) then
S := Etype (Discrete_Subtype_Definition (Declaration_Node (Ent)));
Expr := Num;
end if;
- -- Now add lengths of preceding entries and entry families.
+ -- Now add lengths of preceding entries and entry families
Prev := First_Entity (Ttyp);
Right_Opnd =>
Make_Integer_Literal (Sloc, 1)));
- -- Other components are anonymous types to be ignored.
+ -- Other components are anonymous types to be ignored
else
null;
Pid : Entity_Id;
Loc : Source_Ptr)
is
+ Decl : Node_Id;
Obj_Ptr : Node_Id;
begin
New_External_Name
(Chars (Corresponding_Record_Type (Pid)), 'P'));
- Prepend_To (Decls,
+ Decl :=
Make_Object_Declaration (Loc,
Defining_Identifier =>
Make_Defining_Identifier (Loc, Name_uObject),
Object_Definition => New_Reference_To (Obj_Ptr, Loc),
Expression =>
Unchecked_Convert_To (Obj_Ptr,
- Make_Identifier (Loc, Name_uO))));
+ Make_Identifier (Loc, Name_uO)));
+ Set_Needs_Debug_Info (Defining_Identifier (Decl));
+ Prepend_To (Decls, Decl);
Prepend_To (Decls,
Make_Full_Type_Declaration (Loc,
New_Reference_To (Corresponding_Record_Type (Pid), Loc))));
end Add_Object_Pointer;
+ --------------------------
+ -- Add_Formal_Renamings --
+ --------------------------
+
+ procedure Add_Formal_Renamings
+ (Spec : Node_Id;
+ Decls : List_Id;
+ Ent : Entity_Id;
+ Loc : Source_Ptr)
+ is
+ Ptr : constant Entity_Id :=
+ Defining_Identifier
+ (Next (First (Parameter_Specifications (Spec))));
+ -- The name of the formal that holds the address of the parameter block
+ -- for the call.
+
+ Comp : Entity_Id;
+ Decl : Node_Id;
+ Formal : Entity_Id;
+ New_F : Entity_Id;
+
+ begin
+ Formal := First_Formal (Ent);
+ while Present (Formal) loop
+ Comp := Entry_Component (Formal);
+ New_F :=
+ Make_Defining_Identifier (Sloc (Formal), Chars (Formal));
+ Set_Etype (New_F, Etype (Formal));
+ Set_Scope (New_F, Ent);
+ Set_Needs_Debug_Info (New_F); -- That's the whole point.
+
+ if Ekind (Formal) = E_In_Parameter then
+ Set_Ekind (New_F, E_Constant);
+ else
+ Set_Ekind (New_F, E_Variable);
+ Set_Extra_Constrained (New_F, Extra_Constrained (Formal));
+ end if;
+
+ Set_Actual_Subtype (New_F, Actual_Subtype (Formal));
+
+ Decl :=
+ Make_Object_Renaming_Declaration (Loc,
+ Defining_Identifier => New_F,
+ Subtype_Mark => New_Reference_To (Etype (Formal), Loc),
+ Name =>
+ Make_Explicit_Dereference (Loc,
+ Make_Selected_Component (Loc,
+ Prefix =>
+ Unchecked_Convert_To (Entry_Parameters_Type (Ent),
+ Make_Identifier (Loc, Chars (Ptr))),
+ Selector_Name =>
+ New_Reference_To (Comp, Loc))));
+
+ Append (Decl, Decls);
+ Set_Renamed_Object (Formal, New_F);
+ Next_Formal (Formal);
+ end loop;
+ end Add_Formal_Renamings;
+
------------------------------
-- Add_Private_Declarations --
------------------------------
Loc : Source_Ptr)
is
Def : constant Node_Id := Protected_Definition (Parent (Typ));
+ Decl : Node_Id;
Body_Ent : constant Entity_Id := Corresponding_Body (Parent (Typ));
P : Node_Id;
Pdef : Entity_Id;
if Present (Private_Declarations (Def)) then
P := First (Private_Declarations (Def));
-
while Present (P) loop
if Nkind (P) = N_Component_Declaration then
Pdef := Defining_Identifier (P);
- Prepend_To (Decls,
+
+ -- The privals are declared before the current body is
+ -- analyzed. for visibility reasons. Set their Sloc so
+ -- that it is consistent with their renaming declaration,
+ -- to prevent anomalies in gdb.
+
+ -- This kludgy model for privals should be redesigned ???
+
+ Set_Sloc (Prival (Pdef), Loc);
+
+ Decl :=
Make_Object_Renaming_Declaration (Loc,
Defining_Identifier => Prival (Pdef),
Subtype_Mark => New_Reference_To (Etype (Pdef), Loc),
Name =>
Make_Selected_Component (Loc,
Prefix => Make_Identifier (Loc, Name),
- Selector_Name => Make_Identifier (Loc, Chars (Pdef)))));
+ Selector_Name => Make_Identifier (Loc, Chars (Pdef))));
+ Set_Needs_Debug_Info (Defining_Identifier (Decl));
+ Prepend_To (Decls, Decl);
end if;
+
Next (P);
end loop;
end if;
- -- One more "prival" for the object itself, with the right protection
- -- type.
+ -- One more "prival" for object itself, with the right protection type
declare
Protection_Type : RE_Id;
+
begin
if Has_Attach_Handler (Typ) then
if Restricted_Profile then
elsif Has_Interrupt_Handler (Typ) then
Protection_Type := RE_Dynamic_Interrupt_Protection;
- elsif Has_Entries (Typ) then
+ -- The type has explicit entries or generated primitive entry
+ -- wrappers.
+
+ elsif Has_Entries (Typ)
+ or else (Ada_Version >= Ada_05
+ and then Present (Interface_List (Parent (Typ))))
+ then
if Abort_Allowed
or else Restriction_Active (No_Entry_Queue) = False
or else Number_Entries (Typ) > 1
Protection_Type := RE_Protection;
end if;
- Prepend_To (Decls,
+ -- Adjust Sloc, as for the other privals
+
+ Set_Sloc (Object_Ref (Body_Ent), Loc);
+
+ Decl :=
Make_Object_Renaming_Declaration (Loc,
Defining_Identifier => Object_Ref (Body_Ent),
Subtype_Mark => New_Reference_To (RTE (Protection_Type), Loc),
Name =>
Make_Selected_Component (Loc,
Prefix => Make_Identifier (Loc, Name),
- Selector_Name => Make_Identifier (Loc, Name_uObject))));
+ Selector_Name => Make_Identifier (Loc, Name_uObject)));
+ Set_Needs_Debug_Info (Defining_Identifier (Decl));
+ Prepend_To (Decls, Decl);
end;
end Add_Private_Declarations;
begin
-- At the end of the statement sequence, Complete_Rendezvous is called.
- -- A label skipping the Complete_Rendezvous, and all other
- -- accept processing, has already been added for the expansion
- -- of requeue statements.
+ -- A label skipping the Complete_Rendezvous, and all other accept
+ -- processing, has already been added for the expansion of requeue
+ -- statements.
Call := Build_Runtime_Call (Loc, RE_Complete_Rendezvous);
Insert_Before (Last (Statements (Stats)), Call);
Set_Exception_Handlers (New_S,
New_List (
- Make_Exception_Handler (Loc,
+ Make_Implicit_Exception_Handler (Loc,
Exception_Choices => New_List (Ohandle),
Statements => New_List (
procedure Build_Activation_Chain_Entity (N : Node_Id) is
P : Node_Id;
- B : Node_Id;
Decls : List_Id;
+ Chain : Entity_Id;
begin
-- Loop to find enclosing construct containing activation chain variable
and then Nkind (P) /= N_Package_Body
and then Nkind (P) /= N_Block_Statement
and then Nkind (P) /= N_Task_Body
+ and then Nkind (P) /= N_Extended_Return_Statement
loop
P := Parent (P);
end loop;
-- If we are in a package body, the activation chain variable is
- -- allocated in the corresponding spec. First, we save the package
- -- body node because we enter the new entity in its Declarations list.
-
- B := P;
+ -- declared in the body, but the Activation_Chain_Entity is attached to
+ -- the spec.
if Nkind (P) = N_Package_Body then
+ Decls := Declarations (P);
P := Unit_Declaration_Node (Corresponding_Spec (P));
- Decls := Declarations (B);
elsif Nkind (P) = N_Package_Declaration then
- Decls := Visible_Declarations (Specification (B));
+ Decls := Visible_Declarations (Specification (P));
+
+ elsif Nkind (P) = N_Extended_Return_Statement then
+ Decls := Return_Object_Declarations (P);
else
- Decls := Declarations (B);
+ Decls := Declarations (P);
end if;
-- If activation chain entity not already declared, declare it
- if No (Activation_Chain_Entity (P)) then
- Set_Activation_Chain_Entity
- (P, Make_Defining_Identifier (Sloc (N), Name_uChain));
+ if Nkind (P) = N_Extended_Return_Statement
+ or else No (Activation_Chain_Entity (P))
+ then
+ Chain := Make_Defining_Identifier (Sloc (N), Name_uChain);
+
+ -- Note: An extended return statement is not really a task activator,
+ -- but it does have an activation chain on which to store the tasks
+ -- temporarily. On successful return, the tasks on this chain are
+ -- moved to the chain passed in by the caller. We do not build an
+ -- Activatation_Chain_Entity for an N_Extended_Return_Statement,
+ -- because we do not want to build a call to Activate_Tasks. Task
+ -- activation is the responsibility of the caller.
+
+ if Nkind (P) /= N_Extended_Return_Statement then
+ Set_Activation_Chain_Entity (P, Chain);
+ end if;
Prepend_To (Decls,
Make_Object_Declaration (Sloc (P),
- Defining_Identifier => Activation_Chain_Entity (P),
+ Defining_Identifier => Chain,
Aliased_Present => True,
- Object_Definition =>
+ Object_Definition =>
New_Reference_To (RTE (RE_Activation_Chain), Sloc (P))));
Analyze (First (Decls));
----------------------------
function Build_Barrier_Function
- (N : Node_Id;
- Ent : Entity_Id;
- Pid : Node_Id) return Node_Id
+ (N : Node_Id;
+ Ent : Entity_Id;
+ Pid : Node_Id) return Node_Id
is
Loc : constant Source_Ptr := Sloc (N);
Ent_Formals : constant Node_Id := Entry_Body_Formal_Part (N);
Index_Spec : constant Node_Id := Entry_Index_Specification
(Ent_Formals);
- Op_Decls : constant List_Id := New_List;
- Bdef : Entity_Id;
- Bspec : Node_Id;
+ Op_Decls : constant List_Id := New_List;
+ Bdef : Entity_Id;
+ Bspec : Node_Id;
+ EBF : Node_Id;
begin
Bdef :=
- Make_Defining_Identifier (Loc, Chars (Barrier_Function (Ent)));
+ Make_Defining_Identifier (Loc,
+ Chars => Chars (Barrier_Function (Ent)));
Bspec := Build_Barrier_Function_Specification (Bdef, Loc);
-- <object pointer declaration>
Index_Con : constant Entity_Id :=
Make_Defining_Identifier (Loc,
Chars => New_Internal_Name ('J'));
-
begin
Set_Entry_Index_Constant (Index_Id, Index_Con);
Append_List_To (Op_Decls,
-- processed for the C/Fortran boolean possibility, but this happens
-- automatically since the return statement does this normalization.
- return
+ EBF :=
Make_Subprogram_Body (Loc,
Specification => Bspec,
Declarations => Op_Decls,
Statements => New_List (
Make_Return_Statement (Loc,
Expression => Condition (Ent_Formals)))));
+ Set_Is_Entry_Barrier_Function (EBF);
+ return EBF;
end Build_Barrier_Function;
------------------------------------------
Loc : Source_Ptr) return Node_Id
is
begin
+ Set_Needs_Debug_Info (Def_Id);
return Make_Function_Specification (Loc,
Defining_Unit_Name => Def_Id,
Parameter_Specifications => New_List (
Parameter_Type =>
New_Reference_To (RTE (RE_Protected_Entry_Index), Loc))),
- Subtype_Mark => New_Reference_To (Standard_Boolean, Loc));
+ Result_Definition => New_Reference_To (Standard_Boolean, Loc));
end Build_Barrier_Function_Specification;
--------------------------
E : Entity_Id) return Node_Id
is
Loc : constant Source_Ptr := Sloc (N);
-
begin
return
Make_Function_Call (Loc,
Cdecls : List_Id;
begin
- Set_Corresponding_Record_Type (Ctyp, Rec_Ent);
+ Set_Corresponding_Record_Type (Ctyp, Rec_Ent);
Set_Ekind (Rec_Ent, E_Record_Type);
Set_Has_Delayed_Freeze (Rec_Ent, Has_Delayed_Freeze (Ctyp));
Set_Is_Concurrent_Record_Type (Rec_Ent, True);
end if;
-- Now we can construct the record type declaration. Note that this
- -- record is limited, reflecting the underlying limitedness of the
- -- task or protected object that it represents, and ensuring for
- -- example that it is properly passed by reference.
+ -- record is "limited tagged". It is "limited" to reflect the underlying
+ -- limitedness of the task or protected object that it represents, and
+ -- ensuring for example that it is properly passed by reference. It is
+ -- "tagged" to give support to dispatching calls through interfaces (Ada
+ -- 2005: AI-345)
return
Make_Full_Type_Declaration (Loc,
Component_List =>
Make_Component_List (Loc,
Component_Items => Cdecls),
+ Tagged_Present =>
+ Ada_Version >= Ada_05 and then Is_Tagged_Type (Ctyp),
Limited_Present => True));
end Build_Corresponding_Record;
Lo : Node_Id;
Hi : Node_Id;
Typ : Entity_Id;
+ Large : Boolean;
begin
- Ent := First_Entity (Concurrent_Type);
- Eindx := 0;
-
-- Count number of non-family entries
+ Eindx := 0;
+ Ent := First_Entity (Concurrent_Type);
while Present (Ent) loop
if Ekind (Ent) = E_Entry then
Eindx := Eindx + 1;
Ent := First_Entity (Concurrent_Type);
Comp := First (Component_List);
-
while Present (Ent) loop
if Ekind (Ent) = E_Entry_Family then
while Chars (Ent) /= Chars (Defining_Identifier (Comp)) loop
Typ := Etype (Discrete_Subtype_Definition (Parent (Ent)));
Hi := Type_High_Bound (Typ);
Lo := Type_Low_Bound (Typ);
-
+ Large := Is_Potentially_Large_Family
+ (Base_Type (Typ), Concurrent_Type, Lo, Hi);
Ecount :=
Make_Op_Add (Loc,
Left_Opnd => Ecount,
- Right_Opnd => Family_Size (Loc, Hi, Lo, Concurrent_Type));
+ Right_Opnd => Family_Size
+ (Loc, Hi, Lo, Concurrent_Type, Large));
end if;
Next_Entity (Ent);
end Build_Entry_Count_Expression;
---------------------------
+ -- Build_Parameter_Block --
+ ---------------------------
+
+ function Build_Parameter_Block
+ (Loc : Source_Ptr;
+ Actuals : List_Id;
+ Formals : List_Id;
+ Decls : List_Id) return Entity_Id
+ is
+ Actual : Entity_Id;
+ Comp_Nam : Node_Id;
+ Comps : List_Id;
+ Formal : Entity_Id;
+ Has_Comp : Boolean := False;
+ Rec_Nam : Node_Id;
+
+ begin
+ Actual := First (Actuals);
+ Comps := New_List;
+ Formal := Defining_Identifier (First (Formals));
+
+ while Present (Actual) loop
+ if not Is_Controlling_Actual (Actual) then
+
+ -- Generate:
+ -- type Ann is access all <actual-type>
+
+ Comp_Nam :=
+ Make_Defining_Identifier (Loc, New_Internal_Name ('A'));
+
+ Append_To (Decls,
+ Make_Full_Type_Declaration (Loc,
+ Defining_Identifier =>
+ Comp_Nam,
+ Type_Definition =>
+ Make_Access_To_Object_Definition (Loc,
+ All_Present =>
+ True,
+ Constant_Present =>
+ Ekind (Formal) = E_In_Parameter,
+ Subtype_Indication =>
+ New_Reference_To (Etype (Actual), Loc))));
+
+ -- Generate:
+ -- Param : Ann;
+
+ Append_To (Comps,
+ Make_Component_Declaration (Loc,
+ Defining_Identifier =>
+ Make_Defining_Identifier (Loc, Chars (Formal)),
+ Component_Definition =>
+ Make_Component_Definition (Loc,
+ Aliased_Present =>
+ False,
+ Subtype_Indication =>
+ New_Reference_To (Comp_Nam, Loc))));
+
+ Has_Comp := True;
+ end if;
+
+ Next_Actual (Actual);
+ Next_Formal_With_Extras (Formal);
+ end loop;
+
+ Rec_Nam :=
+ Make_Defining_Identifier (Loc, New_Internal_Name ('P'));
+
+ if Has_Comp then
+
+ -- Generate:
+ -- type Pnn is record
+ -- Param1 : Ann1;
+ -- ...
+ -- ParamN : AnnN;
+
+ -- where Pnn is a parameter wrapping record, Param1 .. ParamN are
+ -- the original parameter names and Ann1 .. AnnN are the access to
+ -- actual types.
+
+ Append_To (Decls,
+ Make_Full_Type_Declaration (Loc,
+ Defining_Identifier =>
+ Rec_Nam,
+ Type_Definition =>
+ Make_Record_Definition (Loc,
+ Component_List =>
+ Make_Component_List (Loc, Comps))));
+ else
+ -- Generate:
+ -- type Pnn is null record;
+
+ Append_To (Decls,
+ Make_Full_Type_Declaration (Loc,
+ Defining_Identifier =>
+ Rec_Nam,
+ Type_Definition =>
+ Make_Record_Definition (Loc,
+ Null_Present => True,
+ Component_List => Empty)));
+ end if;
+
+ return Rec_Nam;
+ end Build_Parameter_Block;
+
+ ------------------------
+ -- Build_Wrapper_Body --
+ ------------------------
+
+ function Build_Wrapper_Body
+ (Loc : Source_Ptr;
+ Proc_Nam : Entity_Id;
+ Obj_Typ : Entity_Id;
+ Formals : List_Id) return Node_Id
+ is
+ Actuals : List_Id := No_List;
+ Body_Spec : Node_Id;
+ Conv_Id : Node_Id;
+ First_Formal : Node_Id;
+ Formal : Node_Id;
+
+ begin
+ Body_Spec := Build_Wrapper_Spec (Loc, Proc_Nam, Obj_Typ, Formals);
+
+ -- If we did not generate the specification do have nothing else to do
+
+ if Body_Spec = Empty then
+ return Empty;
+ end if;
+
+ -- Map formals to actuals. Use the list built for the wrapper spec,
+ -- skipping the object notation parameter.
+
+ First_Formal := First (Parameter_Specifications (Body_Spec));
+
+ Formal := First_Formal;
+ Next (Formal);
+
+ if Present (Formal) then
+ Actuals := New_List;
+
+ while Present (Formal) loop
+ Append_To (Actuals,
+ Make_Identifier (Loc, Chars =>
+ Chars (Defining_Identifier (Formal))));
+
+ Next (Formal);
+ end loop;
+ end if;
+
+ -- An access-to-variable first parameter will require an explicit
+ -- dereference in the unchecked conversion. This case occurs when
+ -- a protected entry wrapper must override an interface-level
+ -- procedure with interface access as first parameter.
+
+ -- SubprgName (O.all).Proc_Nam (Formal_1 .. Formal_N)
+
+ if Nkind (Parameter_Type (First_Formal)) = N_Access_Definition then
+ Conv_Id :=
+ Make_Explicit_Dereference (Loc,
+ Prefix =>
+ Make_Identifier (Loc, Chars => Name_uO));
+ else
+ Conv_Id :=
+ Make_Identifier (Loc, Chars => Name_uO);
+ end if;
+
+ if Ekind (Proc_Nam) = E_Function then
+ return
+ Make_Subprogram_Body (Loc,
+ Specification => Body_Spec,
+ Declarations => Empty_List,
+ Handled_Statement_Sequence =>
+ Make_Handled_Sequence_Of_Statements (Loc,
+ Statements =>
+ New_List (
+ Make_Return_Statement (Loc,
+ Make_Function_Call (Loc,
+ Name =>
+ Make_Selected_Component (Loc,
+ Prefix =>
+ Unchecked_Convert_To (
+ Corresponding_Concurrent_Type (Obj_Typ),
+ Conv_Id),
+ Selector_Name =>
+ New_Reference_To (Proc_Nam, Loc)),
+ Parameter_Associations => Actuals)))));
+ else
+ return
+ Make_Subprogram_Body (Loc,
+ Specification => Body_Spec,
+ Declarations => Empty_List,
+ Handled_Statement_Sequence =>
+ Make_Handled_Sequence_Of_Statements (Loc,
+ Statements =>
+ New_List (
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ Make_Selected_Component (Loc,
+ Prefix =>
+ Unchecked_Convert_To (
+ Corresponding_Concurrent_Type (Obj_Typ),
+ Conv_Id),
+ Selector_Name =>
+ New_Reference_To (Proc_Nam, Loc)),
+ Parameter_Associations => Actuals))));
+ end if;
+ end Build_Wrapper_Body;
+
+ ------------------------
+ -- Build_Wrapper_Spec --
+ ------------------------
+
+ function Build_Wrapper_Spec
+ (Loc : Source_Ptr;
+ Proc_Nam : Entity_Id;
+ Obj_Typ : Entity_Id;
+ Formals : List_Id) return Node_Id
+ is
+ New_Name_Id : constant Entity_Id :=
+ Make_Defining_Identifier (Loc, Chars (Proc_Nam));
+
+ First_Param : Node_Id := Empty;
+ Iface : Entity_Id;
+ Iface_Elmt : Elmt_Id := No_Elmt;
+ New_Formals : List_Id;
+ Obj_Param : Node_Id;
+ Obj_Param_Typ : Node_Id;
+ Iface_Prim_Op : Entity_Id;
+ Iface_Prim_Op_Elmt : Elmt_Id;
+
+ function Overriding_Possible
+ (Iface_Prim_Op : Entity_Id;
+ Proc_Nam : Entity_Id) return Boolean;
+ -- Determine whether a primitive operation can be overriden by the
+ -- wrapper. Iface_Prim_Op is the candidate primitive operation of an
+ -- abstract interface type, Proc_Nam is the generated entry wrapper.
+
+ function Replicate_Entry_Formals
+ (Loc : Source_Ptr;
+ Formals : List_Id) return List_Id;
+ -- An explicit parameter replication is required due to the
+ -- Is_Entry_Formal flag being set for all the formals. The explicit
+ -- replication removes the flag that would otherwise cause a different
+ -- path of analysis.
+
+ -------------------------
+ -- Overriding_Possible --
+ -------------------------
+
+ function Overriding_Possible
+ (Iface_Prim_Op : Entity_Id;
+ Proc_Nam : Entity_Id) return Boolean
+ is
+ Prim_Op_Spec : constant Node_Id := Parent (Iface_Prim_Op);
+ Proc_Spec : constant Node_Id := Parent (Proc_Nam);
+
+ Is_Access_To_Variable : Boolean;
+ Is_Out_Present : Boolean;
+
+ function Type_Conformant_Parameters
+ (Prim_Op_Param_Specs : List_Id;
+ Proc_Param_Specs : List_Id) return Boolean;
+ -- Determine whether the parameters of the generated entry wrapper
+ -- and those of a primitive operation are type conformant. During
+ -- this check, the first parameter of the primitive operation is
+ -- always skipped.
+
+ --------------------------------
+ -- Type_Conformant_Parameters --
+ --------------------------------
+
+ function Type_Conformant_Parameters
+ (Prim_Op_Param_Specs : List_Id;
+ Proc_Param_Specs : List_Id) return Boolean
+ is
+ Prim_Op_Param : Node_Id;
+ Prim_Op_Typ : Entity_Id;
+ Proc_Param : Node_Id;
+ Proc_Typ : Entity_Id;
+
+ function Find_Parameter_Type (Param : Node_Id) return Entity_Id;
+ -- Return the controlling type denoted by a formal parameter
+
+ -------------------------
+ -- Find_Parameter_Type --
+ -------------------------
+
+ function Find_Parameter_Type (Param : Node_Id) return Entity_Id is
+ begin
+ if Nkind (Param) /= N_Parameter_Specification then
+ return Empty;
+
+ elsif Nkind (Parameter_Type (Param)) = N_Access_Definition then
+ return Etype (Subtype_Mark (Parameter_Type (Param)));
+
+ else
+ return Etype (Parameter_Type (Param));
+ end if;
+ end Find_Parameter_Type;
+
+ -- Start of processing for Type_Conformant_Parameters
+
+ begin
+ -- Skip the first parameter of the primitive operation
+
+ Prim_Op_Param := Next (First (Prim_Op_Param_Specs));
+ Proc_Param := First (Proc_Param_Specs);
+ while Present (Prim_Op_Param)
+ and then Present (Proc_Param)
+ loop
+ Prim_Op_Typ := Find_Parameter_Type (Prim_Op_Param);
+ Proc_Typ := Find_Parameter_Type (Proc_Param);
+
+ -- The two parameters must be mode conformant
+
+ if not Conforming_Types
+ (Prim_Op_Typ, Proc_Typ, Mode_Conformant)
+ then
+ return False;
+ end if;
+
+ Next (Prim_Op_Param);
+ Next (Proc_Param);
+ end loop;
+
+ -- One of the lists is longer than the other
+
+ if Present (Prim_Op_Param) or else Present (Proc_Param) then
+ return False;
+ end if;
+
+ return True;
+ end Type_Conformant_Parameters;
+
+ -- Start of processing for Overriding_Possible
+
+ begin
+ if Chars (Iface_Prim_Op) /= Chars (Proc_Nam) then
+ return False;
+ end if;
+
+ -- Special check for protected procedures: If an inherited subprogram
+ -- is implemented by a protected procedure or an entry, then the
+ -- first parameter of the inherited subprogram shall be of mode OUT
+ -- or IN OUT, or an access-to-variable parameter.
+
+ if Ekind (Iface_Prim_Op) = E_Procedure then
+
+ Is_Out_Present :=
+ Present (Parameter_Specifications (Prim_Op_Spec))
+ and then
+ Out_Present (First (Parameter_Specifications (Prim_Op_Spec)));
+
+ Is_Access_To_Variable :=
+ Present (Parameter_Specifications (Prim_Op_Spec))
+ and then
+ Nkind (Parameter_Type
+ (First
+ (Parameter_Specifications (Prim_Op_Spec))))
+ = N_Access_Definition;
+
+ if not Is_Out_Present
+ and then not Is_Access_To_Variable
+ then
+ return False;
+ end if;
+ end if;
+
+ return Type_Conformant_Parameters (
+ Parameter_Specifications (Prim_Op_Spec),
+ Parameter_Specifications (Proc_Spec));
+ end Overriding_Possible;
+
+ -----------------------------
+ -- Replicate_Entry_Formals --
+ -----------------------------
+
+ function Replicate_Entry_Formals
+ (Loc : Source_Ptr;
+ Formals : List_Id) return List_Id
+ is
+ New_Formals : constant List_Id := New_List;
+ Formal : Node_Id;
+
+ begin
+ Formal := First (Formals);
+ while Present (Formal) loop
+
+ -- Create an explicit copy of the entry parameter
+
+ Append_To (New_Formals,
+ Make_Parameter_Specification (Loc,
+ Defining_Identifier =>
+ Make_Defining_Identifier (Loc,
+ Chars => Chars (Defining_Identifier (Formal))),
+ In_Present => In_Present (Formal),
+ Out_Present => Out_Present (Formal),
+ Parameter_Type => New_Reference_To (Etype (
+ Parameter_Type (Formal)), Loc)));
+
+ Next (Formal);
+ end loop;
+
+ return New_Formals;
+ end Replicate_Entry_Formals;
+
+ -- Start of processing for Build_Wrapper_Spec
+
+ begin
+ -- The mode is determined by the first parameter of the interface-level
+ -- procedure that the current entry is trying to override.
+
+ pragma Assert (Is_Non_Empty_List (Abstract_Interface_List (Obj_Typ)));
+
+ -- We must examine all the protected operations of the implemented
+ -- interfaces in order to discover a possible overriding candidate.
+
+ Iface := Etype (First (Abstract_Interface_List (Obj_Typ)));
+
+ Examine_Parents : loop
+ if Present (Primitive_Operations (Iface)) then
+ Iface_Prim_Op_Elmt := First_Elmt (Primitive_Operations (Iface));
+ while Present (Iface_Prim_Op_Elmt) loop
+ Iface_Prim_Op := Node (Iface_Prim_Op_Elmt);
+
+ if not Is_Predefined_Dispatching_Operation (Iface_Prim_Op) then
+ while Present (Alias (Iface_Prim_Op)) loop
+ Iface_Prim_Op := Alias (Iface_Prim_Op);
+ end loop;
+
+ -- The current primitive operation can be overriden by the
+ -- generated entry wrapper.
+
+ if Overriding_Possible (Iface_Prim_Op, Proc_Nam) then
+ First_Param := First (Parameter_Specifications
+ (Parent (Iface_Prim_Op)));
+
+ goto Found;
+ end if;
+ end if;
+
+ Next_Elmt (Iface_Prim_Op_Elmt);
+ end loop;
+ end if;
+
+ exit Examine_Parents when Etype (Iface) = Iface;
+
+ Iface := Etype (Iface);
+ end loop Examine_Parents;
+
+ if Present (Abstract_Interfaces
+ (Corresponding_Record_Type (Scope (Proc_Nam))))
+ then
+ Iface_Elmt := First_Elmt
+ (Abstract_Interfaces
+ (Corresponding_Record_Type (Scope (Proc_Nam))));
+ Examine_Interfaces : while Present (Iface_Elmt) loop
+ Iface := Node (Iface_Elmt);
+
+ if Present (Primitive_Operations (Iface)) then
+ Iface_Prim_Op_Elmt := First_Elmt (Primitive_Operations (Iface));
+ while Present (Iface_Prim_Op_Elmt) loop
+ Iface_Prim_Op := Node (Iface_Prim_Op_Elmt);
+
+ if not Is_Predefined_Dispatching_Operation
+ (Iface_Prim_Op)
+ then
+ while Present (Alias (Iface_Prim_Op)) loop
+ Iface_Prim_Op := Alias (Iface_Prim_Op);
+ end loop;
+
+ -- The current primitive operation can be overriden by
+ -- the generated entry wrapper.
+
+ if Overriding_Possible (Iface_Prim_Op, Proc_Nam) then
+ First_Param := First (Parameter_Specifications
+ (Parent (Iface_Prim_Op)));
+
+ goto Found;
+ end if;
+ end if;
+
+ Next_Elmt (Iface_Prim_Op_Elmt);
+ end loop;
+ end if;
+
+ Next_Elmt (Iface_Elmt);
+ end loop Examine_Interfaces;
+ end if;
+
+ -- Return if no interface primitive can be overriden
+
+ return Empty;
+
+ <<Found>>
+
+ New_Formals := Replicate_Entry_Formals (Loc, Formals);
+
+ -- ??? Certain source packages contain protected or task types that do
+ -- not implement any interfaces and are compiled with the -gnat05
+ -- switch. In this case, a default first parameter is created.
+
+ if Present (First_Param) then
+ if Nkind (Parameter_Type (First_Param)) = N_Access_Definition then
+ Obj_Param_Typ :=
+ Make_Access_Definition (Loc,
+ Subtype_Mark =>
+ New_Reference_To (Obj_Typ, Loc));
+ else
+ Obj_Param_Typ := New_Reference_To (Obj_Typ, Loc);
+ end if;
+
+ Obj_Param :=
+ Make_Parameter_Specification (Loc,
+ Defining_Identifier =>
+ Make_Defining_Identifier (Loc, Name_uO),
+ In_Present => In_Present (First_Param),
+ Out_Present => Out_Present (First_Param),
+ Parameter_Type => Obj_Param_Typ);
+
+ else
+ Obj_Param :=
+ Make_Parameter_Specification (Loc,
+ Defining_Identifier =>
+ Make_Defining_Identifier (Loc, Name_uO),
+ In_Present => True,
+ Out_Present => True,
+ Parameter_Type => New_Reference_To (Obj_Typ, Loc));
+ end if;
+
+ Prepend_To (New_Formals, Obj_Param);
+
+ -- Minimum decoration needed to catch the entity in
+ -- Sem_Ch6.Override_Dispatching_Operation
+
+ if Ekind (Proc_Nam) = E_Procedure
+ or else Ekind (Proc_Nam) = E_Entry
+ then
+ Set_Ekind (New_Name_Id, E_Procedure);
+ Set_Is_Primitive_Wrapper (New_Name_Id);
+ Set_Wrapped_Entity (New_Name_Id, Proc_Nam);
+
+ return
+ Make_Procedure_Specification (Loc,
+ Defining_Unit_Name => New_Name_Id,
+ Parameter_Specifications => New_Formals);
+
+ else pragma Assert (Ekind (Proc_Nam) = E_Function);
+ Set_Ekind (New_Name_Id, E_Function);
+
+ return
+ Make_Function_Specification (Loc,
+ Defining_Unit_Name => New_Name_Id,
+ Parameter_Specifications => New_Formals,
+ Result_Definition =>
+ New_Copy (Result_Definition (Parent (Proc_Nam))));
+ end if;
+ end Build_Wrapper_Spec;
+
+ ---------------------------
-- Build_Find_Body_Index --
---------------------------
Siz : Node_Id := Empty;
procedure Add_If_Clause (Expr : Node_Id);
- -- Add test for range of current entry.
+ -- Add test for range of current entry
function Convert_Discriminant_Ref (Bound : Node_Id) return Node_Id;
-- If a bound of an entry is given by a discriminant, retrieve the
Expression => Make_Integer_Literal (Loc, Index + 1)));
begin
- -- Index for current entry body.
+ -- Index for current entry body
Index := Index + 1;
- -- Compute total length of entry queues so far.
+ -- Compute total length of entry queues so far
if No (Siz) then
Siz := Expr;
Spec := Build_Find_Body_Index_Spec (Typ);
Ent := First_Entity (Typ);
-
while Present (Ent) loop
-
if Ekind (Ent) = E_Entry_Family then
Has_F := True;
exit;
E_Typ := Etype (Discrete_Subtype_Definition (Parent (Ent)));
Hi := Convert_Discriminant_Ref (Type_High_Bound (E_Typ));
Lo := Convert_Discriminant_Ref (Type_Low_Bound (E_Typ));
- Add_If_Clause (Family_Size (Loc, Hi, Lo, Typ));
+ Add_If_Clause (Family_Size (Loc, Hi, Lo, Typ, False));
end if;
Next_Entity (Ent);
elsif Nkind (Ret) = N_If_Statement then
- -- Ranges are in increasing order, so last one doesn't need a
- -- guard.
+ -- Ranges are in increasing order, so last one doesn't need guard
declare
Nod : constant Node_Id := Last (Elsif_Parts (Ret));
-
begin
Remove (Nod);
Set_Else_Statements (Ret, Then_Statements (Nod));
Defining_Identifier => Parm2,
Parameter_Type =>
New_Reference_To (RTE (RE_Protected_Entry_Index), Loc))),
- Subtype_Mark => New_Occurrence_Of (
+ Result_Definition => New_Occurrence_Of (
RTE (RE_Protected_Entry_Index), Loc));
end Build_Find_Body_Index_Spec;
begin
S := Scope (E);
- -- Ada 0Y (AI-287): Do not set/get the has_master_entity reminder in
- -- internal scopes. Required for nested limited aggregates.
+ -- Ada 2005 (AI-287): Do not set/get the has_master_entity reminder
+ -- in internal scopes, unless present already.. Required for nested
+ -- limited aggregates. This could use some more explanation ????
- if Extensions_Allowed then
+ if Ada_Version >= Ada_05 then
while Is_Internal (S) loop
S := Scope (S);
end loop;
Insert_Before (P, Decl);
Analyze (Decl);
- -- Ada 0Y (AI-287): Set the has_master_entity reminder in the
+ -- Ada 2005 (AI-287): Set the has_master_entity reminder in the
-- non-internal scope selected above.
- if not Extensions_Allowed then
- Set_Has_Master_Entity (Scope (E));
- else
+ if Ada_Version >= Ada_05 then
Set_Has_Master_Entity (S);
+ else
+ Set_Has_Master_Entity (Scope (E));
end if;
-- Now mark the containing scope as a task master
Ent : Entity_Id;
Pid : Node_Id) return Node_Id
is
- Loc : constant Source_Ptr := Sloc (N);
+ Loc : constant Source_Ptr := Sloc (N);
+
+ End_Lab : constant Node_Id :=
+ End_Label (Handled_Statement_Sequence (N));
+ End_Loc : constant Source_Ptr :=
+ Sloc (Last (Statements (Handled_Statement_Sequence (N))));
+ -- Used for the generated call to Complete_Entry_Body
+
+ Han_Loc : Source_Ptr;
+ -- Used for the exception handler, inserted at end of the body
+
Op_Decls : constant List_Id := New_List;
Edef : Entity_Id;
Espec : Node_Id;
Complete : Node_Id;
begin
+ -- Set the source location on the exception handler only when debugging
+ -- the expanded code (see Make_Implicit_Exception_Handler).
+
+ if Debug_Generated_Code then
+ Han_Loc := End_Loc;
+ else
+ Han_Loc := No_Location;
+ end if;
+
Edef :=
Make_Defining_Identifier (Loc,
Chars => Chars (Protected_Body_Subprogram (Ent)));
Espec := Build_Protected_Entry_Specification (Edef, Empty, Loc);
-- <object pointer declaration>
- -- Add object pointer declaration. This is needed by the
- -- discriminal and prival renamings, which should already
- -- have been inserted into the declaration list.
+
+ -- Add object pointer declaration. This is needed by the discriminal and
+ -- prival renamings, which should already have been inserted into the
+ -- declaration list.
Add_Object_Pointer (Op_Decls, Pid, Loc);
+ -- Add renamings for formals for use by debugger
+
+ Add_Formal_Renamings (Espec, Op_Decls, Ent, Loc);
+
if Abort_Allowed
or else Restriction_Active (No_Entry_Queue) = False
or else Number_Entries (Pid) > 1
+ or else (Has_Attach_Handler (Pid) and then not Restricted_Profile)
then
Complete := New_Reference_To (RTE (RE_Complete_Entry_Body), Loc);
else
Handled_Statement_Sequence =>
Handled_Statement_Sequence (N)),
- Make_Procedure_Call_Statement (Loc,
+ Make_Procedure_Call_Statement (End_Loc,
Name => Complete,
Parameter_Associations => New_List (
- Make_Attribute_Reference (Loc,
+ Make_Attribute_Reference (End_Loc,
Prefix =>
- Make_Selected_Component (Loc,
+ Make_Selected_Component (End_Loc,
Prefix =>
- Make_Identifier (Loc, Name_uObject),
+ Make_Identifier (End_Loc, Name_uObject),
Selector_Name =>
- Make_Identifier (Loc, Name_uObject)),
- Attribute_Name => Name_Unchecked_Access))));
+ Make_Identifier (End_Loc, Name_uObject)),
+ Attribute_Name => Name_Unchecked_Access))));
- if Restriction_Active (No_Exception_Handlers) then
+ -- When exceptions can not be propagated, we never need to call
+ -- Exception_Complete_Entry_Body
+
+ if No_Exception_Handlers_Set then
return
Make_Subprogram_Body (Loc,
Specification => Espec,
Declarations => Op_Decls,
Handled_Statement_Sequence =>
- Make_Handled_Sequence_Of_Statements (Loc, Op_Stats));
+ Make_Handled_Sequence_Of_Statements (Loc,
+ Op_Stats,
+ End_Label => End_Lab));
else
Ohandle := Make_Others_Choice (Loc);
if Abort_Allowed
or else Restriction_Active (No_Entry_Queue) = False
or else Number_Entries (Pid) > 1
+ or else (Has_Attach_Handler (Pid) and then not Restricted_Profile)
then
Complete :=
New_Reference_To (RTE (RE_Exceptional_Complete_Entry_Body), Loc);
RTE (RE_Exceptional_Complete_Single_Entry_Body), Loc);
end if;
+ -- Create body of entry procedure. The renaming declarations are
+ -- placed ahead of the block that contains the actual entry body.
+
return
Make_Subprogram_Body (Loc,
Specification => Espec,
Handled_Statement_Sequence =>
Make_Handled_Sequence_Of_Statements (Loc,
Statements => Op_Stats,
+ End_Label => End_Lab,
Exception_Handlers => New_List (
- Make_Exception_Handler (Loc,
+ Make_Implicit_Exception_Handler (Han_Loc,
Exception_Choices => New_List (Ohandle),
Statements => New_List (
- Make_Procedure_Call_Statement (Loc,
+ Make_Procedure_Call_Statement (Han_Loc,
Name => Complete,
Parameter_Associations => New_List (
- Make_Attribute_Reference (Loc,
+ Make_Attribute_Reference (Han_Loc,
Prefix =>
- Make_Selected_Component (Loc,
+ Make_Selected_Component (Han_Loc,
Prefix =>
- Make_Identifier (Loc, Name_uObject),
+ Make_Identifier (Han_Loc, Name_uObject),
Selector_Name =>
- Make_Identifier (Loc, Name_uObject)),
+ Make_Identifier (Han_Loc, Name_uObject)),
Attribute_Name => Name_Unchecked_Access),
- Make_Function_Call (Loc,
+ Make_Function_Call (Han_Loc,
Name => New_Reference_To (
RTE (RE_Get_GNAT_Exception), Loc)))))))));
end if;
P : Entity_Id;
begin
+ Set_Needs_Debug_Info (Def_Id);
P := Make_Defining_Identifier (Loc, Name_uP);
if Present (Ent_Id) then
Ident : Entity_Id) return List_Id
is
Loc : constant Source_Ptr := Sloc (N);
+ Decl : Node_Id;
Formal : Entity_Id;
New_Plist : List_Id;
New_Param : Node_Id;
begin
New_Plist := New_List;
Formal := First_Formal (Ident);
-
while Present (Formal) loop
New_Param :=
Make_Parameter_Specification (Loc,
-- to protected subprogram, the parameter is in-out. Otherwise it is
-- an in parameter.
- Prepend_To (New_Plist,
+ Decl :=
Make_Parameter_Specification (Loc,
Defining_Identifier =>
Make_Defining_Identifier (Loc, Name_uObject),
Out_Present =>
(Etype (Ident) = Standard_Void_Type
and then not Is_RTE (Obj_Type, RE_Address)),
- Parameter_Type => New_Reference_To (Obj_Type, Loc)));
+ Parameter_Type => New_Reference_To (Obj_Type, Loc));
+ Set_Needs_Debug_Info (Defining_Identifier (Decl));
+ Prepend_To (New_Plist, Decl);
return New_Plist;
end Build_Protected_Spec;
---------------------------------------
function Build_Protected_Sub_Specification
- (N : Node_Id;
- Prottyp : Entity_Id;
- Unprotected : Boolean := False) return Node_Id
+ (N : Node_Id;
+ Prottyp : Entity_Id;
+ Mode : Subprogram_Protection_Mode) return Node_Id
is
- Loc : constant Source_Ptr := Sloc (N);
- Decl : Node_Id;
- Protnm : constant Name_Id := Chars (Prottyp);
- Ident : Entity_Id;
- Nam : Name_Id;
- New_Id : Entity_Id;
- New_Plist : List_Id;
- Append_Char : Character;
- New_Spec : Node_Id;
+ Loc : constant Source_Ptr := Sloc (N);
+ Decl : Node_Id;
+ Ident : Entity_Id;
+ New_Id : Entity_Id;
+ New_Plist : List_Id;
+ New_Spec : Node_Id;
+
+ Append_Chr : constant array (Subprogram_Protection_Mode) of Character :=
+ (Dispatching_Mode => ' ',
+ Protected_Mode => 'P',
+ Unprotected_Mode => 'N');
begin
if Ekind
end if;
Ident := Defining_Unit_Name (Specification (Decl));
- Nam := Chars (Ident);
- New_Plist := Build_Protected_Spec
- (Decl, Corresponding_Record_Type (Prottyp),
- Unprotected, Ident);
-
- if Unprotected then
- Append_Char := 'N';
- else
- Append_Char := 'P';
- end if;
+ New_Plist :=
+ Build_Protected_Spec (Decl,
+ Corresponding_Record_Type (Prottyp),
+ Mode = Unprotected_Mode, Ident);
New_Id :=
Make_Defining_Identifier (Loc,
- Chars => Build_Selected_Name (Protnm, Nam, Append_Char));
+ Chars => Build_Selected_Name (Prottyp, Ident, Append_Chr (Mode)));
-- The unprotected operation carries the user code, and debugging
-- information must be generated for it, even though this spec does
Parameter_Specifications => New_Plist);
else
+ -- We need to create a new specification for the anonymous
+ -- subprogram type.
+
New_Spec :=
Make_Function_Specification (Loc,
Defining_Unit_Name => New_Id,
Parameter_Specifications => New_Plist,
- Subtype_Mark => New_Copy (Subtype_Mark (Specification (Decl))));
+ Result_Definition =>
+ Copy_Result_Type (Result_Definition (Specification (Decl))));
+
Set_Return_Present (Defining_Unit_Name (New_Spec));
return New_Spec;
end if;
function Is_Exception_Safe (Subprogram : Node_Id) return Boolean is
function Has_Side_Effect (N : Node_Id) return Boolean;
- -- Return True whenever encountering a subprogram call or a
- -- raise statement of any kind in the sequence of statements N
+ -- Return True whenever encountering a subprogram call or raise
+ -- statement of any kind in the sequence of statements
---------------------
-- Has_Side_Effect --
---------------------
- -- What is this doing buried two levels down in exp_ch9. It
- -- seems like a generally useful function, and indeed there
- -- may be code duplication going on here ???
+ -- What is this doing buried two levels down in exp_ch9. It seems
+ -- like a generally useful function, and indeed there may be code
+ -- duplication going on here ???
function Has_Side_Effect (N : Node_Id) return Boolean is
- Stmt : Node_Id := N;
+ Stmt : Node_Id;
Expr : Node_Id;
function Is_Call_Or_Raise (N : Node_Id) return Boolean;
-- Indicate whether N is a subprogram call or a raise statement
+ ----------------------
+ -- Is_Call_Or_Raise --
+ ----------------------
+
function Is_Call_Or_Raise (N : Node_Id) return Boolean is
begin
return Nkind (N) = N_Procedure_Call_Statement
-- Start of processing for Has_Side_Effect
begin
+ Stmt := N;
while Present (Stmt) loop
if Is_Call_Or_Raise (Stmt) then
return True;
Exc_Safe := Is_Exception_Safe (N);
P_Op_Spec :=
- Build_Protected_Sub_Specification (N,
- Pid, Unprotected => False);
+ Build_Protected_Sub_Specification (N, Pid, Protected_Mode);
- -- Build a list of the formal parameters of the protected
- -- version of the subprogram to use as the actual parameters
- -- of the unprotected version.
+ -- Build a list of the formal parameters of the protected version of
+ -- the subprogram to use as the actual parameters of the unprotected
+ -- version.
Uactuals := New_List;
Pformal := First (Parameter_Specifications (P_Op_Spec));
-
while Present (Pformal) loop
Append (
Make_Identifier (Loc, Chars (Defining_Identifier (Pformal))),
Next (Pformal);
end loop;
- -- Make a call to the unprotected version of the subprogram
- -- built above for use by the protected version built below.
+ -- Make a call to the unprotected version of the subprogram built above
+ -- for use by the protected version built below.
if Nkind (Op_Spec) = N_Function_Specification then
if Exc_Safe then
Make_Object_Declaration (Loc,
Defining_Identifier => R,
Constant_Present => True,
- Object_Definition => New_Copy (Subtype_Mark (N_Op_Spec)),
+ Object_Definition => New_Copy (Result_Definition (N_Op_Spec)),
Expression =>
Make_Function_Call (Loc,
Name => Make_Identifier (Loc,
Parameter_Associations => Uactuals);
end if;
- -- Wrap call in block that will be covered by an at_end handler.
+ -- Wrap call in block that will be covered by an at_end handler
if not Exc_Safe then
Unprot_Call := Make_Block_Statement (Loc,
if Has_Entries (Pid)
or else Has_Interrupt_Handler (Pid)
- or else (Has_Attach_Handler (Pid) and then not Restricted_Profile)
+ or else (Has_Attach_Handler (Pid)
+ and then not Restricted_Profile)
+ or else (Ada_Version >= Ada_05
+ and then Present (Interface_List (Parent (Pid))))
then
if Abort_Allowed
or else Restriction_Active (No_Entry_Queue) = False
or else Number_Entries (Pid) > 1
+ or else (Has_Attach_Handler (Pid) and then not Restricted_Profile)
then
Lock_Name := New_Reference_To (RTE (RE_Lock_Entries), Loc);
Service_Name := New_Reference_To (RTE (RE_Service_Entries), Loc);
-------------------------
function Build_Selected_Name
- (Prefix, Selector : Name_Id;
- Append_Char : Character := ' ') return Name_Id
+ (Prefix : Entity_Id;
+ Selector : Entity_Id;
+ Append_Char : Character := ' ') return Name_Id
is
Select_Buffer : String (1 .. Hostparm.Max_Name_Length);
Select_Len : Natural;
begin
- Get_Name_String (Selector);
+ Get_Name_String (Chars (Selector));
Select_Len := Name_Len;
Select_Buffer (1 .. Select_Len) := Name_Buffer (1 .. Name_Len);
- Get_Name_String (Prefix);
+ Get_Name_String (Chars (Prefix));
-- If scope is anonymous type, discard suffix to recover name of
-- single protected object. Otherwise use protected type name.
Name_Len := Name_Len - 1;
end if;
- Name_Buffer (Name_Len + 1) := 'P';
- Name_Buffer (Name_Len + 2) := 'T';
- Name_Buffer (Name_Len + 3) := '_';
- Name_Buffer (Name_Len + 4) := '_';
+ Name_Buffer (Name_Len + 1) := '_';
+ Name_Buffer (Name_Len + 2) := '_';
- Name_Len := Name_Len + 4;
+ Name_Len := Name_Len + 2;
for J in 1 .. Select_Len loop
Name_Len := Name_Len + 1;
Name_Buffer (Name_Len) := Select_Buffer (J);
end loop;
+ -- Now add the Append_Char if specified. The encoding to follow
+ -- depends on the type of entity. If Append_Char is either 'N' or 'P',
+ -- then the entity is associated to a protected type subprogram.
+ -- Otherwise, it is a protected type entry. For each case, the
+ -- encoding to follow for the suffix is documented in exp_dbug.ads.
+
+ -- It would be better to encapsulate this as a routine in Exp_Dbug ???
+
if Append_Char /= ' ' then
- Name_Len := Name_Len + 1;
- Name_Buffer (Name_Len) := Append_Char;
+ if Append_Char = 'P' or Append_Char = 'N' then
+ Name_Len := Name_Len + 1;
+ Name_Buffer (Name_Len) := Append_Char;
+ return Name_Find;
+ else
+ Name_Buffer (Name_Len + 1) := '_';
+ Name_Buffer (Name_Len + 2) := Append_Char;
+ Name_Len := Name_Len + 2;
+ return New_External_Name (Name_Find, ' ', -1);
+ end if;
+ else
+ return Name_Find;
end if;
-
- return Name_Find;
end Build_Selected_Name;
-----------------------------
begin
Expand_Call (N);
+ -- If call has been inlined, nothing left to do
+
+ if Nkind (N) = N_Block_Statement then
+ return;
+ end if;
+
-- Convert entry call to Call_Simple call
declare
Loc : constant Source_Ptr := Sloc (N);
Parms : constant List_Id := Parameter_Associations (N);
Stats : constant List_Id := New_List;
- Pdecl : Node_Id;
- Xdecl : Node_Id;
- Decls : List_Id;
+ Actual : Node_Id;
+ Call : Node_Id;
+ Comm_Name : Entity_Id;
Conctyp : Node_Id;
+ Decls : List_Id;
Ent : Entity_Id;
Ent_Acc : Entity_Id;
+ Formal : Node_Id;
+ Iface_Tag : Entity_Id;
+ Iface_Typ : Entity_Id;
+ N_Node : Node_Id;
+ N_Var : Node_Id;
P : Entity_Id;
- X : Entity_Id;
- Plist : List_Id;
Parm1 : Node_Id;
Parm2 : Node_Id;
Parm3 : Node_Id;
- Call : Node_Id;
- Actual : Node_Id;
- Formal : Node_Id;
- N_Node : Node_Id;
- N_Var : Node_Id;
- Comm_Name : Entity_Id;
+ Pdecl : Node_Id;
+ Plist : List_Id;
+ X : Entity_Id;
+ Xdecl : Node_Id;
begin
-- Simple entry and entry family cases merge here
Conctyp := Designated_Type (Conctyp);
end if;
- -- Special case for protected subprogram calls.
+ -- Special case for protected subprogram calls
if Is_Protected_Type (Conctyp)
and then Is_Subprogram (Entity (Ename))
or else Restriction_Active (No_Entry_Queue) = False
or else not Is_Protected_Type (Conctyp)
or else Number_Entries (Conctyp) > 1
+ or else (Has_Attach_Handler (Conctyp)
+ and then not Restricted_Profile)
then
X := Make_Defining_Identifier (Loc, Name_uX);
end if;
-- The third parameter is the packaged parameters. If there are
- -- none, then it is just the null address, since nothing is passed
+ -- none, then it is just the null address, since nothing is passed.
if No (Parms) then
Parm3 := New_Reference_To (RTE (RE_Null_Address), Loc);
-- of a packaged record containing the required parameter values.
else
- -- First build a list of parameter values, which are
- -- references to objects of the parameter types.
+ -- First build a list of parameter values, which are references to
+ -- objects of the parameter types.
Plist := New_List;
Object_Definition =>
New_Reference_To (Etype (Formal), Loc));
- -- We have to make an assignment statement separate for
- -- the case of limited type. We can not assign it unless
- -- the Assignment_OK flag is set first.
+ -- Mark the object as not needing initialization since the
+ -- initialization is performed separately, avoiding errors
+ -- on cases such as formals of null-excluding access types.
+
+ Set_No_Initialization (N_Node);
+
+ -- We have to make an assignment statement separate for the
+ -- case of limited type. We cannot assign it unless the
+ -- Assignment_OK flag is set first.
if Ekind (Formal) /= E_Out_Parameter then
N_Var :=
Prefix =>
New_Reference_To (Defining_Identifier (N_Node), Loc)));
else
- Append_To (Plist,
- Make_Reference (Loc, Prefix => Relocate_Node (Actual)));
+ -- Interface class-wide formal
+
+ if Ada_Version >= Ada_05
+ and then Ekind (Etype (Formal)) = E_Class_Wide_Type
+ and then Is_Interface (Etype (Formal))
+ then
+ Iface_Typ := Etype (Etype (Formal));
+
+ -- Generate:
+ -- formal_iface_type! (actual.iface_tag)'reference
+
+ Iface_Tag :=
+ Find_Interface_Tag (Etype (Actual), Iface_Typ);
+ pragma Assert (Present (Iface_Tag));
+
+ Append_To (Plist,
+ Make_Reference (Loc,
+ Unchecked_Convert_To (Iface_Typ,
+ Make_Selected_Component (Loc,
+ Prefix =>
+ Relocate_Node (Actual),
+ Selector_Name =>
+ New_Reference_To (Iface_Tag, Loc)))));
+ else
+ -- Generate:
+ -- actual'reference
+
+ Append_To (Plist,
+ Make_Reference (Loc, Relocate_Node (Actual)));
+ end if;
end if;
Next_Actual (Actual);
if Abort_Allowed
or else Restriction_Active (No_Entry_Queue) = False
or else Number_Entries (Conctyp) > 1
+ or else (Has_Attach_Handler (Conctyp)
+ and then not Restricted_Profile)
then
-- Change the type of the index declaration
Append_To (Stats, Call);
- -- If there are out or in/out parameters by copy
- -- add assignment statements for the result values.
+ -- If there are out or in/out parameters by copy add assignment
+ -- statements for the result values.
if Present (Parms) then
Actual := First_Actual (N);
Selector_Name =>
Make_Identifier (Loc, Chars (Formal)))));
- -- In all cases (including limited private types) we
- -- want the assignment to be valid.
+ -- In all cases (including limited private types) we want
+ -- the assignment to be valid.
Set_Assignment_OK (Name (N_Node));
-- If the call is the triggering alternative in an
- -- asynchronous select, or the entry_call alternative
- -- of a conditional entry call, the assignments for in-out
- -- parameters are incorporated into the statement list
- -- that follows, so that there are executed only if the
- -- entry call succeeds.
+ -- asynchronous select, or the entry_call alternative of a
+ -- conditional entry call, the assignments for in-out
+ -- parameters are incorporated into the statement list that
+ -- follows, so that there are executed only if the entry
+ -- call succeeds.
if (Nkind (Parent (N)) = N_Triggering_Alternative
and then N = Triggering_Statement (Parent (N)))
--------------------------------
procedure Build_Task_Activation_Call (N : Node_Id) is
- Loc : constant Source_Ptr := Sloc (N);
- Chain : Entity_Id;
- Call : Node_Id;
- Name : Node_Id;
- P : Node_Id;
+ Loc : constant Source_Ptr := Sloc (N);
+ Chain : Entity_Id;
+ Call : Node_Id;
+ Name : Node_Id;
+ P : Node_Id;
begin
-- Get the activation chain entity. Except in the case of a package
- -- body, this is in the node that w as passed. For a package body, we
+ -- body, this is in the node that was passed. For a package body, we
-- have to find the corresponding package declaration node.
if Nkind (N) = N_Package_Body then
P := Corresponding_Spec (N);
-
loop
P := Parent (P);
exit when Nkind (P) = N_Package_Declaration;
else
if Present (Handled_Statement_Sequence (N)) then
- -- The call goes at the start of the statement sequence, but
+ -- The call goes at the start of the statement sequence
-- after the start of exception range label if one is present.
declare
begin
Stm := First (Statements (Handled_Statement_Sequence (N)));
+ -- A special case, skip exception range label if one is
+ -- present (from front end zcx processing).
+
if Nkind (Stm) = N_Label and then Exception_Junk (Stm) then
Next (Stm);
end if;
+ -- Another special case, if the first statement is a block
+ -- from optimization of a local raise to a goto, then the
+ -- call goes inside this block.
+
+ if Nkind (Stm) = N_Block_Statement
+ and then Exception_Junk (Stm)
+ then
+ Stm :=
+ First (Statements (Handled_Statement_Sequence (Stm)));
+ end if;
+
+ -- Insertion point is after any exception label pushes,
+ -- since we want it covered by any local handlers.
+
+ while Nkind (Stm) in N_Push_xxx_Label loop
+ Next (Stm);
+ end loop;
+
+ -- Now we have the proper insertion point
+
Insert_Before (Stm, Call);
end;
-----------------------------------
function Build_Task_Proc_Specification (T : Entity_Id) return Node_Id is
- Loc : constant Source_Ptr := Sloc (T);
- Nam : constant Name_Id := Chars (T);
- Tdec : constant Node_Id := Declaration_Node (T);
- Ent : Entity_Id;
+ Loc : constant Source_Ptr := Sloc (T);
+ Nam : constant Name_Id := Chars (T);
+ Ent : Entity_Id;
begin
Ent :=
-- Associate the procedure with the task, if this is the declaration
-- (and not the body) of the procedure.
- if No (Task_Body_Procedure (Tdec)) then
- Set_Task_Body_Procedure (Tdec, Ent);
+ if No (Task_Body_Procedure (T)) then
+ Set_Task_Body_Procedure (T, Ent);
end if;
return
Op_Decls : List_Id;
begin
- -- Make an unprotected version of the subprogram for use
- -- within the same object, with a new name and an additional
- -- parameter representing the object.
+ -- Make an unprotected version of the subprogram for use within the same
+ -- object, with a new name and an additional parameter representing the
+ -- object.
Op_Decls := Declarations (N);
N_Op_Spec :=
- Build_Protected_Sub_Specification
- (N, Pid, Unprotected => True);
+ Build_Protected_Sub_Specification (N, Pid, Unprotected_Mode);
return
Make_Subprogram_Body (Loc,
Make_Defining_Identifier (Loc,
Chars => New_Internal_Name ('F'));
- Efam_Decl :=
- Make_Full_Type_Declaration (Loc,
- Defining_Identifier => Efam_Type,
- Type_Definition =>
- Make_Unconstrained_Array_Definition (Loc,
- Subtype_Marks => (New_List (
- New_Occurrence_Of (
+ declare
+ Bas : Entity_Id :=
Base_Type
- (Etype (Discrete_Subtype_Definition
- (Parent (Efam)))), Loc))),
+ (Etype (Discrete_Subtype_Definition (Parent (Efam))));
+ Bas_Decl : Node_Id := Empty;
+ Lo, Hi : Node_Id;
+
+ begin
+ Get_Index_Bounds
+ (Discrete_Subtype_Definition (Parent (Efam)), Lo, Hi);
+
+ if Is_Potentially_Large_Family (Bas, Conctyp, Lo, Hi) then
+ Bas :=
+ Make_Defining_Identifier (Loc, New_Internal_Name ('B'));
+ Bas_Decl :=
+ Make_Subtype_Declaration (Loc,
+ Defining_Identifier => Bas,
+ Subtype_Indication =>
+ Make_Subtype_Indication (Loc,
+ Subtype_Mark =>
+ New_Occurrence_Of (Standard_Integer, Loc),
+ Constraint =>
+ Make_Range_Constraint (Loc,
+ Range_Expression => Make_Range (Loc,
+ Make_Integer_Literal
+ (Loc, -Entry_Family_Bound),
+ Make_Integer_Literal
+ (Loc, Entry_Family_Bound - 1)))));
+
+ Insert_After (Current_Node, Bas_Decl);
+ Current_Node := Bas_Decl;
+ Analyze (Bas_Decl);
+ end if;
+
+ Efam_Decl :=
+ Make_Full_Type_Declaration (Loc,
+ Defining_Identifier => Efam_Type,
+ Type_Definition =>
+ Make_Unconstrained_Array_Definition (Loc,
+ Subtype_Marks =>
+ (New_List (New_Occurrence_Of (Bas, Loc))),
Component_Definition =>
Make_Component_Definition (Loc,
Aliased_Present => False,
Subtype_Indication =>
New_Reference_To (Standard_Character, Loc))));
+ end;
Insert_After (Current_Node, Efam_Decl);
Current_Node := Efam_Decl;
end loop;
end Collect_Entry_Families;
+ ----------------------
+ -- Copy_Result_Type --
+ ----------------------
+
+ function Copy_Result_Type (Res : Node_Id) return Node_Id is
+ New_Res : constant Node_Id := New_Copy_Tree (Res);
+ Par_Spec : Node_Id;
+ Formal : Entity_Id;
+
+ begin
+ if Nkind (New_Res) = N_Access_Definition then
+
+ -- Provide new entities for the formals
+
+ Par_Spec := First (Parameter_Specifications
+ (Access_To_Subprogram_Definition (New_Res)));
+ while Present (Par_Spec) loop
+ Formal := Defining_Identifier (Par_Spec);
+ Set_Defining_Identifier (Par_Spec,
+ Make_Defining_Identifier (Sloc (Formal), Chars (Formal)));
+ Next (Par_Spec);
+ end loop;
+ end if;
+
+ return New_Res;
+ end Copy_Result_Type;
+
--------------------
-- Concurrent_Ref --
--------------------
- -- The expression returned for a reference to a concurrent
- -- object has the form:
+ -- The expression returned for a reference to a concurrent object has the
+ -- form:
-- taskV!(name)._Task_Id
-- objectV!(name)._Object
- -- for a protected object.
-
- -- For the case of an access to a concurrent object,
- -- there is an extra explicit dereference:
+ -- for a protected object. For the case of an access to a concurrent
+ -- object, there is an extra explicit dereference:
-- taskV!(name.all)._Task_Id
-- objectV!(name.all)._Object
-- here taskV and objectV are the types for the associated records, which
- -- contain the required _Task_Id and _Object fields for tasks and
- -- protected objects, respectively.
+ -- contain the required _Task_Id and _Object fields for tasks and protected
+ -- objects, respectively.
-- For the case of a task type name, the expression is
-- objectR
- -- which is a renaming of the _object field of the current object
- -- object record, passed into protected operations as a parameter.
+ -- which is a renaming of the _object field of the current object object
+ -- record, passed into protected operations as a parameter.
function Concurrent_Ref (N : Node_Id) return Node_Id is
Loc : constant Source_Ptr := Sloc (N);
end if;
end loop;
- -- We know that we are within the task body, so should have
- -- found it in scope.
+ -- We know that we are within the task body, so should have found it
+ -- in scope.
raise Program_Error;
end Is_Current_Task;
else
declare
Decl : Node_Id;
- T_Self : constant Entity_Id
- := Make_Defining_Identifier (Loc, New_Internal_Name ('T'));
- T_Body : constant Node_Id
- := Parent (Corresponding_Body (Parent (Entity (N))));
+ T_Self : constant Entity_Id :=
+ Make_Defining_Identifier (Loc,
+ Chars => New_Internal_Name ('T'));
+ T_Body : constant Node_Id :=
+ Parent (Corresponding_Body (Parent (Entity (N))));
begin
Decl := Make_Object_Declaration (Loc,
Defining_Identifier => T_Self,
Object_Definition =>
- New_Occurrence_Of (RTE (RO_ST_Task_ID), Loc),
+ New_Occurrence_Of (RTE (RO_ST_Task_Id), Loc),
Expression =>
Make_Function_Call (Loc,
Name => New_Reference_To (RTE (RE_Self), Loc)));
S : Node_Id;
begin
- -- The queues of entries and entry families appear in textual
- -- order in the associated record. The entry index is computed as
- -- the sum of the number of queues for all entries that precede the
- -- designated one, to which is added the index expression, if this
- -- expression denotes a member of a family.
+ -- The queues of entries and entry families appear in textual order in
+ -- the associated record. The entry index is computed as the sum of the
+ -- number of queues for all entries that precede the designated one, to
+ -- which is added the index expression, if this expression denotes a
+ -- member of a family.
- -- The following is a place holder for the count of simple entries.
+ -- The following is a place holder for the count of simple entries
Num := Make_Integer_Literal (Sloc, 1);
- -- We construct an expression which is a series of addition
- -- operations. The first operand is the number of single entries that
- -- precede this one, the second operand is the index value relative
- -- to the start of the referenced family, and the remaining operands
- -- are the lengths of the entry families that precede this entry, i.e.
- -- the constructed expression is:
+ -- We construct an expression which is a series of addition operations.
+ -- The first operand is the number of single entries that precede this
+ -- one, the second operand is the index value relative to the start of
+ -- the referenced family, and the remaining operands are the lengths of
+ -- the entry families that precede this entry, i.e. the constructed
+ -- expression is:
-- number_simple_entries +
-- (s'pos (index-value) - s'pos (family'first)) + 1 +
-- where index-value is the given index value, and s is the index
-- subtype (we have to use pos because the subtype might be an
- -- enumeration type preventing direct subtraction).
- -- Note that the task entry array is one-indexed.
+ -- enumeration type preventing direct subtraction). Note that the task
+ -- entry array is one-indexed.
-- The upper bound of the entry family may be a discriminant, so we
-- retrieve the lower bound explicitly to compute offset, rather than
Prefix => New_Reference_To (Base_Type (S), Sloc),
Expressions => New_List (Relocate_Node (Index))),
Type_Low_Bound (S),
- Ttyp));
+ Ttyp,
+ False));
else
Expr := Num;
end if;
- -- Now add lengths of preceding entries and entry families.
+ -- Now add lengths of preceding entries and entry families
Prev := First_Entity (Ttyp);
Expr :=
Make_Op_Add (Sloc,
Left_Opnd => Expr,
- Right_Opnd => Family_Size (Sloc, Hi, Lo, Ttyp));
+ Right_Opnd => Family_Size (Sloc, Hi, Lo, Ttyp, False));
- -- Other components are anonymous types to be ignored.
+ -- Other components are anonymous types to be ignored
else
null;
procedure Establish_Task_Master (N : Node_Id) is
Call : Node_Id;
-
begin
if Restriction_Active (No_Task_Hierarchy) = False then
Call := Build_Runtime_Call (Sloc (N), RE_Enter_Master);
-- We can distinguish the two cases by seeing whether the accept statement
-- is part of a list. If not, then it must be in an accept alternative.
- -- To expand the requeue statement, a label is provided at the end of
- -- the accept statement or alternative of which it is a part, so that
- -- the statement can be skipped after the requeue is complete.
- -- This label is created here rather than during the expansion of the
- -- accept statement, because it will be needed by any requeue
- -- statements within the accept, which are expanded before the
- -- accept.
+ -- To expand the requeue statement, a label is provided at the end of the
+ -- accept statement or alternative of which it is a part, so that the
+ -- statement can be skipped after the requeue is complete. This label is
+ -- created here rather than during the expansion of the accept statement,
+ -- because it will be needed by any requeue statements within the accept,
+ -- which are expanded before the accept.
procedure Expand_Accept_Declarations (N : Node_Id; Ent : Entity_Id) is
Loc : constant Source_Ptr := Sloc (N);
-- allowed to modify queue orders for a given priority at will!
if Opt.Task_Dispatching_Policy = 'F' and then
- not Present (Handled_Statement_Sequence (N))
+ No (Handled_Statement_Sequence (N))
then
Set_Handled_Statement_Sequence (N,
Make_Handled_Sequence_Of_Statements (Loc,
-- Create and declare two labels to be placed at the end of the
-- accept statement. The first label is used to allow requeues to
- -- skip the remainder of entry processing. The second label is
- -- used to skip the remainder of entry processing if the rendezvous
+ -- skip the remainder of entry processing. The second label is used
+ -- to skip the remainder of entry processing if the rendezvous
-- completes in the middle of the accept body.
if Present (Handled_Statement_Sequence (N)) then
pragma Assert (Nkind (Acc_Alt) = N_Accept_Alternative);
pragma Assert (Nkind (Sel_Acc) = N_Selective_Accept);
- -- ??? Consider a single label for select statements.
+ -- ??? Consider a single label for select statements
if Present (Handled_Statement_Sequence (N)) then
Prepend (Ldecl2,
Next (Alt);
end loop;
- -- If we are the first accept statement, then we have to
- -- create the Ann variable, as for the stand alone case,
- -- except that it is inserted before the selective accept.
- -- Similarly, a label for requeue expansion must be
- -- declared.
+ -- If we are the first accept statement, then we have to create
+ -- the Ann variable, as for the stand alone case, except that
+ -- it is inserted before the selective accept. Similarly, a
+ -- label for requeue expansion must be declared.
if N = Accept_Statement (Alt) then
Ann :=
Insert_Before (Sel_Acc, Adecl);
Analyze (Adecl);
- -- If we are not the first accept statement, then find the
- -- Ann variable allocated by the first accept and use it.
+ -- If we are not the first accept statement, then find the Ann
+ -- variable allocated by the first accept and use it.
else
Ann :=
Set_Needs_Debug_Info (Ann);
end if;
- -- Create renaming declarations for the entry formals. Each
- -- reference to a formal becomes a dereference of a component
- -- of the parameter block, whose address is held in Ann.
- -- These declarations are eventually inserted into the accept
- -- block, and analyzed there so that they have the proper scope
- -- for gdb and do not conflict with other declarations.
+ -- Create renaming declarations for the entry formals. Each reference
+ -- to a formal becomes a dereference of a component of the parameter
+ -- block, whose address is held in Ann. These declarations are
+ -- eventually inserted into the accept block, and analyzed there so
+ -- that they have the proper scope for gdb and do not conflict with
+ -- other declarations.
if Present (Parameter_Specifications (N))
and then Present (Handled_Statement_Sequence (N))
then
declare
- Formal : Entity_Id;
- New_F : Entity_Id;
Comp : Entity_Id;
Decl : Node_Id;
+ Formal : Entity_Id;
+ New_F : Entity_Id;
begin
- New_Scope (Ent);
+ Push_Scope (Ent);
Formal := First_Formal (Ent);
while Present (Formal) loop
- Comp := Entry_Component (Formal);
- New_F :=
+ Comp := Entry_Component (Formal);
+ New_F :=
Make_Defining_Identifier (Sloc (Formal), Chars (Formal));
+
Set_Etype (New_F, Etype (Formal));
Set_Scope (New_F, Ent);
Set_Needs_Debug_Info (New_F); -- That's the whole point.
Decl :=
Make_Object_Renaming_Declaration (Loc,
- Defining_Identifier => New_F,
- Subtype_Mark => New_Reference_To (Etype (Formal), Loc),
- Name =>
- Make_Explicit_Dereference (Loc,
- Make_Selected_Component (Loc,
- Prefix =>
- Unchecked_Convert_To (Entry_Parameters_Type (Ent),
- New_Reference_To (Ann, Loc)),
- Selector_Name =>
- New_Reference_To (Comp, Loc))));
+ Defining_Identifier =>
+ New_F,
+ Subtype_Mark =>
+ New_Reference_To (Etype (Formal), Loc),
+ Name =>
+ Make_Explicit_Dereference (Loc,
+ Make_Selected_Component (Loc,
+ Prefix =>
+ Unchecked_Convert_To (
+ Entry_Parameters_Type (Ent),
+ New_Reference_To (Ann, Loc)),
+ Selector_Name =>
+ New_Reference_To (Comp, Loc))));
if No (Declarations (N)) then
Set_Declarations (N, New_List);
Comps : List_Id;
T : constant Entity_Id := Defining_Identifier (N);
D_T : constant Entity_Id := Designated_Type (T);
- D_T2 : constant Entity_Id := Make_Defining_Identifier
- (Loc, New_Internal_Name ('D'));
- E_T : constant Entity_Id := Make_Defining_Identifier
- (Loc, New_Internal_Name ('E'));
+ D_T2 : constant Entity_Id := Make_Defining_Identifier (Loc,
+ Chars => New_Internal_Name ('D'));
+ E_T : constant Entity_Id := Make_Defining_Identifier (Loc,
+ Chars => New_Internal_Name ('E'));
P_List : constant List_Id := Build_Protected_Spec
(N, RTE (RE_Address), False, D_T);
Decl1 : Node_Id;
Def1 : Node_Id;
begin
- -- Create access to protected subprogram with full signature.
+ -- Create access to protected subprogram with full signature
if Nkind (Type_Definition (N)) = N_Access_Function_Definition then
Def1 :=
Make_Access_Function_Definition (Loc,
Parameter_Specifications => P_List,
- Subtype_Mark => New_Copy (Subtype_Mark (Type_Definition (N))));
+ Result_Definition =>
+ Copy_Result_Type (Result_Definition (Type_Definition (N))));
else
Def1 :=
Analyze (Decl1);
Insert_After (N, Decl1);
- -- Create Equivalent_Type, a record with two components for an
- -- access to object and an access to subprogram.
+ -- Create Equivalent_Type, a record with two components for an access to
+ -- object and an access to subprogram.
Comps := New_List (
Make_Component_Declaration (Loc,
return;
end if;
- -- The body of the entry barrier must be analyzed in the context of
- -- the protected object, but its scope is external to it, just as any
- -- other unprotected version of a protected operation. The specification
- -- has been produced when the protected type declaration was elaborated.
- -- We build the body, insert it in the enclosing scope, but analyze it
- -- in the current context. A more uniform approach would be to treat a
+ -- The body of the entry barrier must be analyzed in the context of the
+ -- protected object, but its scope is external to it, just as any other
+ -- unprotected version of a protected operation. The specification has
+ -- been produced when the protected type declaration was elaborated. We
+ -- build the body, insert it in the enclosing scope, but analyze it in
+ -- the current context. A more uniform approach would be to treat
-- barrier just as a protected function, and discard the protected
-- version of it because it is never called.
Update_Prival_Subtypes (B_F);
- Set_Privals (Spec_Decl, N, Loc);
+ Set_Privals (Spec_Decl, N, Loc, After_Barrier => True);
Set_Discriminals (Spec_Decl);
Set_Scope (Func, Scope (Prot));
Analyze_And_Resolve (Cond, Any_Boolean);
end if;
- -- The Ravenscar profile restricts barriers to simple variables
- -- declared within the protected object. We also allow Boolean
- -- constants, since these appear in several published examples
- -- and are also allowed by the Aonix compiler.
+ -- The Ravenscar profile restricts barriers to simple variables declared
+ -- within the protected object. We also allow Boolean constants, since
+ -- these appear in several published examples and are also allowed by
+ -- the Aonix compiler.
- -- Note that after analysis variables in this context will be
- -- replaced by the corresponding prival, that is to say a renaming
- -- of a selected component of the form _Object.Var. If expansion is
- -- disabled, as within a generic, we check that the entity appears in
- -- the current scope.
+ -- Note that after analysis variables in this context will be replaced
+ -- by the corresponding prival, that is to say a renaming of a selected
+ -- component of the form _Object.Var. If expansion is disabled, as
+ -- within a generic, we check that the entity appears in the current
+ -- scope.
if Is_Entity_Name (Cond) then
-
if Entity (Cond) = Standard_False
or else
Entity (Cond) = Standard_True
while Present (Tasknm) loop
Count := Count + 1;
- Append_To (Component_Associations (Aggr),
- Make_Component_Association (Loc,
- Choices => New_List (
- Make_Integer_Literal (Loc, Count)),
- Expression => Concurrent_Ref (Tasknm)));
+
+ -- A task interface class-wide type object is being aborted.
+ -- Retrieve its _task_id by calling a dispatching routine.
+
+ if Ada_Version >= Ada_05
+ and then Ekind (Etype (Tasknm)) = E_Class_Wide_Type
+ and then Is_Interface (Etype (Tasknm))
+ and then Is_Task_Interface (Etype (Tasknm))
+ then
+ Append_To (Component_Associations (Aggr),
+ Make_Component_Association (Loc,
+ Choices => New_List (
+ Make_Integer_Literal (Loc, Count)),
+ Expression =>
+
+ -- Task_Id (Tasknm._disp_get_task_id)
+
+ Make_Unchecked_Type_Conversion (Loc,
+ Subtype_Mark =>
+ New_Reference_To (RTE (RO_ST_Task_Id), Loc),
+ Expression =>
+ Make_Selected_Component (Loc,
+ Prefix =>
+ New_Copy_Tree (Tasknm),
+ Selector_Name =>
+ Make_Identifier (Loc, Name_uDisp_Get_Task_Id)))));
+
+ else
+ Append_To (Component_Associations (Aggr),
+ Make_Component_Association (Loc,
+ Choices => New_List (
+ Make_Integer_Literal (Loc, Count)),
+ Expression => Concurrent_Ref (Tasknm)));
+ end if;
+
Next (Tasknm);
end loop;
-- Exceptional_Complete_Rendezvous (Get_GNAT_Exception);
-- end;
- -- The first three declarations were already inserted ahead of the
- -- accept statement by the Expand_Accept_Declarations procedure, which
- -- was called directly from the semantics during analysis of the accept.
- -- statement, before analyzing its contained statements.
+ -- The first three declarations were already inserted ahead of the accept
+ -- statement by the Expand_Accept_Declarations procedure, which was called
+ -- directly from the semantics during analysis of the accept. statement,
+ -- before analyzing its contained statements.
-- The declarations from the N_Accept_Statement, as noted in Sinfo, come
-- from possible expansion activity (the original source of course does
function Null_Statements (Stats : List_Id) return Boolean;
-- Check for null statement sequence (i.e a list of labels and
- -- null statements)
+ -- null statements).
+
+ ---------------------
+ -- Null_Statements --
+ ---------------------
function Null_Statements (Stats : List_Id) return Boolean is
Stmt : Node_Id;
Declarations => Declarations (N),
Handled_Statement_Sequence => Build_Accept_Body (N));
- -- Prepend call to Accept_Call to main statement sequence
- -- If the accept has exception handlers, the statement sequence
- -- is wrapped in a block. Insert call and renaming declarations
- -- in the declarations of the block, so they are elaborated before
- -- the handlers.
+ -- Prepend call to Accept_Call to main statement sequence If the
+ -- accept has exception handlers, the statement sequence is wrapped
+ -- in a block. Insert call and renaming declarations in the
+ -- declarations of the block, so they are elaborated before the
+ -- handlers.
Call :=
Make_Procedure_Call_Statement (Loc,
Analyze (Call);
- New_Scope (Blkent);
+ Push_Scope (Blkent);
declare
D : Node_Id;
Next_D : Node_Id;
Typ : Entity_Id;
+
begin
D := First (Declarations (N));
-
while Present (D) loop
Next_D := Next (D);
if Nkind (D) = N_Object_Renaming_Declaration then
- -- The renaming declarations for the formals were
- -- created during analysis of the accept statement,
- -- and attached to the list of declarations. Place
- -- them now in the context of the accept block or
- -- subprogram.
+
+ -- The renaming declarations for the formals were created
+ -- during analysis of the accept statement, and attached to
+ -- the list of declarations. Place them now in the context
+ -- of the accept block or subprogram.
Remove (D);
Typ := Entity (Subtype_Mark (D));
Insert_After (Call, D);
Analyze (D);
- -- If the formal is class_wide, it does not have an
- -- actual subtype. The analysis of the renaming declaration
- -- creates one, but we need to retain the class-wide
- -- nature of the entity.
+ -- If the formal is class_wide, it does not have an actual
+ -- subtype. The analysis of the renaming declaration creates
+ -- one, but we need to retain the class-wide nature of the
+ -- entity.
if Is_Class_Wide_Type (Typ) then
Set_Etype (Defining_Identifier (D), Typ);
-- Expand_N_Asynchronous_Select --
----------------------------------
- -- This procedure assumes that the trigger statement is an entry
- -- call. A delay alternative should already have been expanded
- -- into an entry call to the appropriate delay object Wait entry.
+ -- This procedure assumes that the trigger statement is an entry call or
+ -- a dispatching procedure call. A delay alternative should already have
+ -- been expanded into an entry call to the appropriate delay object Wait
+ -- entry.
- -- If the trigger is a task entry call, the select is implemented
- -- with Task_Entry_Call:
+ -- If the trigger is a task entry call, the select is implemented with
+ -- a Task_Entry_Call:
-- declare
-- B : Boolean;
-- C : Boolean;
-- P : parms := (parm, parm, parm);
- -- -- Clean is added by Exp_Ch7.Expand_Cleanup_Actions.
+ -- -- Clean is added by Exp_Ch7.Expand_Cleanup_Actions
-- procedure _clean is
-- begin
-- begin
-- begin
-- Abort_Undefer;
- -- abortable-part
+ -- <abortable-part>
-- at end
-- _clean; -- Added by Exp_Ch7.Expand_Cleanup_Actions.
-- end;
-
-- exception
- -- when Abort_Signal => Abort_Undefer;
+ -- when Abort_Signal => Abort_Undefer;
-- end;
+
-- parm := P.param;
-- parm := P.param;
-- ...
-- if not C then
- -- triggered-statements
+ -- <triggered-statements>
-- end if;
-- end;
-- Mode => Asynchronous_Call;
-- Block => Bnn);
-- if Enqueued (Bnn) then
- -- <abortable part>
+ -- <abortable-part>
-- end if;
-- at end
-- _clean; -- Added by Exp_Ch7.Expand_Cleanup_Actions.
-- end;
-
-- exception
- -- when Abort_Signal =>
- -- Abort_Undefer;
- -- null;
+ -- when Abort_Signal => Abort_Undefer;
-- end;
-- if not Cancelled (Bnn) then
- -- triggered statements
+ -- <triggered-statements>
-- end if;
-- end;
-- ...
-- end;
- -- The job is to convert this to the asynchronous form.
+ -- Ada 2005 (AI-345): If the trigger is a dispatching call, the select is
+ -- expanded into:
+
+ -- declare
+ -- B : Boolean := False;
+ -- Bnn : Communication_Block;
+ -- C : Ada.Tags.Prim_Op_Kind;
+ -- D : Dummy_Communication_Block;
+ -- K : Ada.Tags.Tagged_Kind :=
+ -- Ada.Tags.Get_Tagged_Kind (Ada.Tags.Tag (<object>));
+ -- P : Parameters := (Param1 .. ParamN);
+ -- S : Integer;
+ -- U : Boolean;
+
+ -- begin
+ -- if K = Ada.Tags.TK_Limited_Tagged then
+ -- <dispatching-call>;
+ -- <triggering-statements>;
+
+ -- else
+ -- S := Ada.Tags.Get_Offset_Index (Ada.Tags.Tag (<object>),
+ -- DT_Position (<dispatching-call>));
+
+ -- _Disp_Get_Prim_Op_Kind (<object>, S, C);
+
+ -- if C = POK_Protected_Entry then
+ -- declare
+ -- procedure _clean is
+ -- begin
+ -- if Enqueued (Bnn) then
+ -- Cancel_Protected_Entry_Call (Bnn);
+ -- end if;
+ -- end _clean;
+
+ -- begin
+ -- begin
+ -- _Disp_Asynchronous_Select
+ -- (<object>, S, P'address, D, B);
+ -- Bnn := Communication_Block (D);
+
+ -- Param1 := P.Param1;
+ -- ...
+ -- ParamN := P.ParamN;
+
+ -- if Enqueued (Bnn) then
+ -- <abortable-statements>
+ -- end if;
+ -- at end
+ -- _clean;
+ -- end;
+ -- exception
+ -- when Abort_Signal => Abort_Undefer;
+ -- end;
+
+ -- if not Cancelled (Bnn) then
+ -- <triggering-statements>
+ -- end if;
+
+ -- elsif C = POK_Task_Entry then
+ -- declare
+ -- procedure _clean is
+ -- begin
+ -- Cancel_Task_Entry_Call (U);
+ -- end _clean;
+
+ -- begin
+ -- Abort_Defer;
+
+ -- _Disp_Asynchronous_Select
+ -- (<object>, S, P'address, D, B);
+ -- Bnn := Communication_Bloc (D);
+
+ -- Param1 := P.Param1;
+ -- ...
+ -- ParamN := P.ParamN;
+
+ -- begin
+ -- begin
+ -- Abort_Undefer;
+ -- <abortable-statements>
+ -- at end
+ -- _clean;
+ -- end;
+ -- exception
+ -- when Abort_Signal => Abort_Undefer;
+ -- end;
+
+ -- if not U then
+ -- <triggering-statements>
+ -- end if;
+ -- end;
+
+ -- else
+ -- <dispatching-call>;
+ -- <triggering-statements>
+ -- end if;
+ -- end if;
+ -- end;
+
+ -- The job is to convert this to the asynchronous form
- -- If the trigger is a delay statement, it will have been expanded
- -- into a call to one of the GNARL delay procedures. This routine
- -- will convert this into a protected entry call on a delay object
- -- and then continue processing as for a protected entry call trigger.
- -- This requires declaring a Delay_Block object and adding a pointer
- -- to this object to the parameter list of the delay procedure to form
- -- the parameter list of the entry call. This object is used by
- -- the runtime to queue the delay request.
+ -- If the trigger is a delay statement, it will have been expanded into a
+ -- call to one of the GNARL delay procedures. This routine will convert
+ -- this into a protected entry call on a delay object and then continue
+ -- processing as for a protected entry call trigger. This requires
+ -- declaring a Delay_Block object and adding a pointer to this object to
+ -- the parameter list of the delay procedure to form the parameter list of
+ -- the entry call. This object is used by the runtime to queue the delay
+ -- request.
-- For a description of the use of P and the assignments after the
-- call, see Expand_N_Entry_Call_Statement.
procedure Expand_N_Asynchronous_Select (N : Node_Id) is
Loc : constant Source_Ptr := Sloc (N);
- Trig : constant Node_Id := Triggering_Alternative (N);
Abrt : constant Node_Id := Abortable_Part (N);
- Tstats : constant List_Id := Statements (Trig);
Astats : constant List_Id := Statements (Abrt);
+ Trig : constant Node_Id := Triggering_Alternative (N);
+ Tstats : constant List_Id := Statements (Trig);
- Ecall : Node_Id;
- Concval : Node_Id;
- Ename : Node_Id;
- Index : Node_Id;
- Hdle : List_Id;
- Decls : List_Id;
- Decl : Node_Id;
- Parms : List_Id;
- Parm : Node_Id;
- Call : Node_Id;
- Stmts : List_Id;
- Enqueue_Call : Node_Id;
- Stmt : Node_Id;
- B : Entity_Id;
- Pdef : Entity_Id;
- Dblock_Ent : Entity_Id;
- N_Orig : Node_Id;
- Abortable_Block : Node_Id;
- Cancel_Param : Entity_Id;
- Blkent : Entity_Id;
- Target_Undefer : RE_Id;
- Undefer_Args : List_Id := No_List;
+ Abort_Block_Ent : Entity_Id;
+ Abortable_Block : Node_Id;
+ Actuals : List_Id;
+ Blk_Ent : Entity_Id;
+ Blk_Typ : Entity_Id;
+ Call : Node_Id;
+ Call_Ent : Entity_Id;
+ Cancel_Param : Entity_Id;
+ Cleanup_Block : Node_Id;
+ Cleanup_Block_Ent : Entity_Id;
+ Cleanup_Stmts : List_Id;
+ Conc_Typ_Stmts : List_Id;
+ Concval : Node_Id;
+ Dblock_Ent : Entity_Id;
+ Decl : Node_Id;
+ Decls : List_Id;
+ Ecall : Node_Id;
+ Ename : Node_Id;
+ Enqueue_Call : Node_Id;
+ Formals : List_Id;
+ Hdle : List_Id;
+ Index : Node_Id;
+ Lim_Typ_Stmts : List_Id;
+ N_Orig : Node_Id;
+ Obj : Entity_Id;
+ Param : Node_Id;
+ Params : List_Id;
+ Pdef : Entity_Id;
+ ProtE_Stmts : List_Id;
+ ProtP_Stmts : List_Id;
+ Stmt : Node_Id;
+ Stmts : List_Id;
+ Target_Undefer : RE_Id;
+ TaskE_Stmts : List_Id;
+ Undefer_Args : List_Id := No_List;
+
+ B : Entity_Id; -- Call status flag
+ Bnn : Entity_Id; -- Communication block
+ C : Entity_Id; -- Call kind
+ K : Entity_Id; -- Tagged kind
+ P : Entity_Id; -- Parameter block
+ S : Entity_Id; -- Primitive operation slot
+ T : Entity_Id; -- Additional status flag
begin
- Blkent := Make_Defining_Identifier (Loc, New_Internal_Name ('A'));
- Ecall := Triggering_Statement (Trig);
+ Blk_Ent := Make_Defining_Identifier (Loc, New_Internal_Name ('A'));
+ Ecall := Triggering_Statement (Trig);
-- The arguments in the call may require dynamic allocation, and the
-- call statement may have been transformed into a block. The block
if Nkind (Ecall) = N_Block_Statement then
Ecall := First (Statements (Handled_Statement_Sequence (Ecall)));
-
while Nkind (Ecall) /= N_Procedure_Call_Statement
and then Nkind (Ecall) /= N_Entry_Call_Statement
loop
end loop;
end if;
- -- If a delay was used as a trigger, it will have been expanded
- -- into a procedure call. Convert it to the appropriate sequence of
- -- statements, similar to what is done for a task entry call.
- -- Note that this currently supports only Duration, Real_Time.Time,
- -- and Calendar.Time.
+ -- This is either a dispatching call or a delay statement used as a
+ -- trigger which was expanded into a procedure call.
if Nkind (Ecall) = N_Procedure_Call_Statement then
+ if Ada_Version >= Ada_05
+ and then
+ (No (Original_Node (Ecall))
+ or else
+ (Nkind (Original_Node (Ecall)) /= N_Delay_Relative_Statement
+ and then
+ Nkind (Original_Node (Ecall)) /= N_Delay_Until_Statement))
+ then
+ Extract_Dispatching_Call (Ecall, Call_Ent, Obj, Actuals, Formals);
+
+ Decls := New_List;
+ Stmts := New_List;
+
+ -- Call status flag processing, generate:
+ -- B : Boolean := False;
+
+ B := Build_B (Loc, Decls);
+
+ -- Communication block processing, generate:
+ -- Bnn : Communication_Block;
+
+ Bnn := Make_Defining_Identifier (Loc, New_Internal_Name ('B'));
+
+ Append_To (Decls,
+ Make_Object_Declaration (Loc,
+ Defining_Identifier =>
+ Bnn,
+ Object_Definition =>
+ New_Reference_To (RTE (RE_Communication_Block), Loc)));
+
+ -- Call kind processing, generate:
+ -- C : Ada.Tags.Prim_Op_Kind;
+
+ C := Build_C (Loc, Decls);
+
+ -- Tagged kind processing, generate:
+ -- K : Ada.Tags.Tagged_Kind :=
+ -- Ada.Tags.Get_Tagged_Kind (Ada.Tags.Tag (<object>));
+
+ -- Dummy communication block, generate:
+ -- D : Dummy_Communication_Block;
+
+ Append_To (Decls,
+ Make_Object_Declaration (Loc,
+ Defining_Identifier =>
+ Make_Defining_Identifier (Loc, Name_uD),
+ Object_Definition =>
+ New_Reference_To (
+ RTE (RE_Dummy_Communication_Block), Loc)));
+
+ K := Build_K (Loc, Decls, Obj);
+
+ -- Parameter block processing
+
+ Blk_Typ := Build_Parameter_Block
+ (Loc, Actuals, Formals, Decls);
+ P := Parameter_Block_Pack
+ (Loc, Blk_Typ, Actuals, Formals, Decls, Stmts);
+
+ -- Dispatch table slot processing, generate:
+ -- S : Integer;
+
+ S := Build_S (Loc, Decls);
+
+ -- Additional status flag processing, generate:
+
+ T := Make_Defining_Identifier (Loc, New_Internal_Name ('T'));
+
+ Append_To (Decls,
+ Make_Object_Declaration (Loc,
+ Defining_Identifier =>
+ T,
+ Object_Definition =>
+ New_Reference_To (Standard_Boolean, Loc)));
+
+ -- ---------------------------------------------------------------
+ -- Protected entry handling
+
+ -- Generate:
+ -- Param1 := P.Param1;
+ -- ...
+ -- ParamN := P.ParamN;
+
+ Cleanup_Stmts := Parameter_Block_Unpack (Loc, P, Actuals, Formals);
+
+ -- Generate:
+ -- Bnn := Communication_Block (D);
+
+ Prepend_To (Cleanup_Stmts,
+ Make_Assignment_Statement (Loc,
+ Name =>
+ New_Reference_To (Bnn, Loc),
+ Expression =>
+ Make_Unchecked_Type_Conversion (Loc,
+ Subtype_Mark =>
+ New_Reference_To (RTE (RE_Communication_Block), Loc),
+ Expression =>
+ Make_Identifier (Loc, Name_uD))));
+
+ -- Generate:
+ -- _Disp_Asynchronous_Select (<object>, S, P'address, D, B);
+
+ Prepend_To (Cleanup_Stmts,
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (
+ Find_Prim_Op (Etype (Etype (Obj)),
+ Name_uDisp_Asynchronous_Select),
+ Loc),
+ Parameter_Associations =>
+ New_List (
+ New_Copy_Tree (Obj),
+ New_Reference_To (S, Loc),
+ Make_Attribute_Reference (Loc,
+ Prefix => New_Reference_To (P, Loc),
+ Attribute_Name => Name_Address),
+ Make_Identifier (Loc, Name_uD),
+ New_Reference_To (B, Loc))));
+
+ -- Generate:
+ -- if Enqueued (Bnn) then
+ -- <abortable-statements>
+ -- end if;
+
+ Append_To (Cleanup_Stmts,
+ Make_If_Statement (Loc,
+ Condition =>
+ Make_Function_Call (Loc,
+ Name =>
+ New_Reference_To (RTE (RE_Enqueued), Loc),
+ Parameter_Associations =>
+ New_List (
+ New_Reference_To (Bnn, Loc))),
+
+ Then_Statements =>
+ New_Copy_List_Tree (Astats)));
+
+ -- Wrap the statements in a block. Exp_Ch7.Expand_Cleanup_Actions
+ -- will then generate a _clean for the communication block Bnn.
+
+ -- Generate:
+ -- declare
+ -- procedure _clean is
+ -- begin
+ -- if Enqueued (Bnn) then
+ -- Cancel_Protected_Entry_Call (Bnn);
+ -- end if;
+ -- end _clean;
+ -- begin
+ -- Cleanup_Stmts
+ -- at end
+ -- _clean;
+ -- end;
+
+ Cleanup_Block_Ent :=
+ Make_Defining_Identifier (Loc, New_Internal_Name ('C'));
+
+ Cleanup_Block :=
+ Build_Cleanup_Block (Loc, Cleanup_Block_Ent, Cleanup_Stmts, Bnn);
+
+ -- Wrap the cleanup block in an exception handling block
+
+ -- Generate:
+ -- begin
+ -- Cleanup_Block
+ -- exception
+ -- when Abort_Signal => Abort_Undefer;
+ -- end;
+
+ Abort_Block_Ent :=
+ Make_Defining_Identifier (Loc, New_Internal_Name ('A'));
+
+ ProtE_Stmts :=
+ New_List (
+ Make_Implicit_Label_Declaration (Loc,
+ Defining_Identifier => Abort_Block_Ent),
+
+ Build_Abort_Block
+ (Loc, Abort_Block_Ent, Cleanup_Block_Ent, Cleanup_Block));
+
+ -- Generate:
+ -- if not Cancelled (Bnn) then
+ -- <triggering-statements>
+ -- end if;
+
+ Append_To (ProtE_Stmts,
+ Make_If_Statement (Loc,
+ Condition =>
+ Make_Op_Not (Loc,
+ Right_Opnd =>
+ Make_Function_Call (Loc,
+ Name =>
+ New_Reference_To (RTE (RE_Cancelled), Loc),
+ Parameter_Associations =>
+ New_List (
+ New_Reference_To (Bnn, Loc)))),
+
+ Then_Statements =>
+ New_Copy_List_Tree (Tstats)));
+
+ -- ---------------------------------------------------------------
+ -- Task entry handling
+
+ -- Generate:
+ -- Param1 := P.Param1;
+ -- ...
+ -- ParamN := P.ParamN;
+
+ TaskE_Stmts := Parameter_Block_Unpack (Loc, P, Actuals, Formals);
+
+ -- Generate:
+ -- Bnn := Communication_Block (D);
+
+ Append_To (TaskE_Stmts,
+ Make_Assignment_Statement (Loc,
+ Name =>
+ New_Reference_To (Bnn, Loc),
+ Expression =>
+ Make_Unchecked_Type_Conversion (Loc,
+ Subtype_Mark =>
+ New_Reference_To (RTE (RE_Communication_Block), Loc),
+ Expression =>
+ Make_Identifier (Loc, Name_uD))));
+
+ -- Generate:
+ -- _Disp_Asynchronous_Select (<object>, S, P'address, D, B);
+
+ Prepend_To (TaskE_Stmts,
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (
+ Find_Prim_Op (Etype (Etype (Obj)),
+ Name_uDisp_Asynchronous_Select),
+ Loc),
+ Parameter_Associations =>
+ New_List (
+ New_Copy_Tree (Obj),
+ New_Reference_To (S, Loc),
+ Make_Attribute_Reference (Loc,
+ Prefix => New_Reference_To (P, Loc),
+ Attribute_Name => Name_Address),
+ Make_Identifier (Loc, Name_uD),
+ New_Reference_To (B, Loc))));
+
+ -- Generate:
+ -- Abort_Defer;
+
+ Prepend_To (TaskE_Stmts,
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (RTE (RE_Abort_Defer), Loc),
+ Parameter_Associations =>
+ No_List));
+
+ -- Generate:
+ -- Abort_Undefer;
+ -- <abortable-statements>
+
+ Cleanup_Stmts := New_Copy_List_Tree (Astats);
+
+ Prepend_To (Cleanup_Stmts,
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (RTE (RE_Abort_Undefer), Loc),
+ Parameter_Associations =>
+ No_List));
+
+ -- Wrap the statements in a block. Exp_Ch7.Expand_Cleanup_Actions
+ -- will generate a _clean for the additional status flag.
+
+ -- Generate:
+ -- declare
+ -- procedure _clean is
+ -- begin
+ -- Cancel_Task_Entry_Call (U);
+ -- end _clean;
+ -- begin
+ -- Cleanup_Stmts
+ -- at end
+ -- _clean;
+ -- end;
+
+ Cleanup_Block_Ent :=
+ Make_Defining_Identifier (Loc, New_Internal_Name ('C'));
+
+ Cleanup_Block :=
+ Build_Cleanup_Block (Loc, Cleanup_Block_Ent, Cleanup_Stmts, T);
+
+ -- Wrap the cleanup block in an exception handling block
+
+ -- Generate:
+ -- begin
+ -- Cleanup_Block
+ -- exception
+ -- when Abort_Signal => Abort_Undefer;
+ -- end;
+
+ Abort_Block_Ent :=
+ Make_Defining_Identifier (Loc, New_Internal_Name ('A'));
+
+ Append_To (TaskE_Stmts,
+ Make_Implicit_Label_Declaration (Loc,
+ Defining_Identifier => Abort_Block_Ent));
+
+ Append_To (TaskE_Stmts,
+ Build_Abort_Block
+ (Loc, Abort_Block_Ent, Cleanup_Block_Ent, Cleanup_Block));
+
+ -- Generate:
+ -- if not T then
+ -- <triggering-statements>
+ -- end if;
+
+ Append_To (TaskE_Stmts,
+ Make_If_Statement (Loc,
+ Condition =>
+ Make_Op_Not (Loc,
+ Right_Opnd =>
+ New_Reference_To (T, Loc)),
+
+ Then_Statements =>
+ New_Copy_List_Tree (Tstats)));
+
+ -------------------------------------------------------------------
+ -- Protected procedure handling
+
+ -- Generate:
+ -- <dispatching-call>;
+ -- <triggering-statements>
+
+ ProtP_Stmts := New_Copy_List_Tree (Tstats);
+ Prepend_To (ProtP_Stmts, New_Copy_Tree (Ecall));
+
+ -- Generate:
+ -- S := Ada.Tags.Get_Offset_Index (
+ -- Ada.Tags.Tag (<object>), DT_Position (Call_Ent));
+
+ Conc_Typ_Stmts := New_List (
+ Build_S_Assignment (Loc, S, Obj, Call_Ent));
- -- Add a Delay_Block object to the parameter list of the
- -- delay procedure to form the parameter list of the Wait
- -- entry call.
+ -- Generate:
+ -- _Disp_Get_Prim_Op_Kind (<object>, S, C);
- Dblock_Ent := Make_Defining_Identifier (Loc, New_Internal_Name ('D'));
+ Append_To (Conc_Typ_Stmts,
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (
+ Find_Prim_Op (Etype (Etype (Obj)),
+ Name_uDisp_Get_Prim_Op_Kind),
+ Loc),
+ Parameter_Associations =>
+ New_List (
+ New_Copy_Tree (Obj),
+ New_Reference_To (S, Loc),
+ New_Reference_To (C, Loc))));
+
+ -- Generate:
+ -- if C = POK_Procedure_Entry then
+ -- ProtE_Stmts
+ -- elsif C = POK_Task_Entry then
+ -- TaskE_Stmts
+ -- else
+ -- ProtP_Stmts
+ -- end if;
+
+ Append_To (Conc_Typ_Stmts,
+ Make_If_Statement (Loc,
+ Condition =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (RE_POK_Protected_Entry), Loc)),
+
+ Then_Statements =>
+ ProtE_Stmts,
+
+ Elsif_Parts =>
+ New_List (
+ Make_Elsif_Part (Loc,
+ Condition =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (RE_POK_Task_Entry), Loc)),
+
+ Then_Statements =>
+ TaskE_Stmts)),
+
+ Else_Statements =>
+ ProtP_Stmts));
+
+ -- Generate:
+ -- <dispatching-call>;
+ -- <triggering-statements>
+
+ Lim_Typ_Stmts := New_Copy_List_Tree (Tstats);
+ Prepend_To (Lim_Typ_Stmts, New_Copy_Tree (Ecall));
+
+ -- Generate:
+ -- if K = Ada.Tags.TK_Limited_Tagged then
+ -- Lim_Typ_Stmts
+ -- else
+ -- Conc_Typ_Stmts
+ -- end if;
+
+ Append_To (Stmts,
+ Make_If_Statement (Loc,
+ Condition =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (K, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (RE_TK_Limited_Tagged), Loc)),
+
+ Then_Statements =>
+ Lim_Typ_Stmts,
+
+ Else_Statements =>
+ Conc_Typ_Stmts));
+
+ Rewrite (N,
+ Make_Block_Statement (Loc,
+ Declarations =>
+ Decls,
+ Handled_Statement_Sequence =>
+ Make_Handled_Sequence_Of_Statements (Loc, Stmts)));
+
+ Analyze (N);
+ return;
- Pdef := Entity (Name (Ecall));
+ -- Delay triggering statement processing
- if Is_RTE (Pdef, RO_CA_Delay_For) then
- Enqueue_Call := New_Reference_To (RTE (RE_Enqueue_Duration), Loc);
+ else
+ -- Add a Delay_Block object to the parameter list of the delay
+ -- procedure to form the parameter list of the Wait entry call.
- elsif Is_RTE (Pdef, RO_CA_Delay_Until) then
- Enqueue_Call := New_Reference_To (RTE (RE_Enqueue_Calendar), Loc);
+ Dblock_Ent :=
+ Make_Defining_Identifier (Loc, New_Internal_Name ('D'));
- else pragma Assert (Is_RTE (Pdef, RO_RT_Delay_Until));
- Enqueue_Call := New_Reference_To (RTE (RE_Enqueue_RT), Loc);
- end if;
+ Pdef := Entity (Name (Ecall));
- Append_To (Parameter_Associations (Ecall),
- Make_Attribute_Reference (Loc,
- Prefix => New_Reference_To (Dblock_Ent, Loc),
- Attribute_Name => Name_Unchecked_Access));
+ if Is_RTE (Pdef, RO_CA_Delay_For) then
+ Enqueue_Call :=
+ New_Reference_To (RTE (RE_Enqueue_Duration), Loc);
- -- Create the inner block to protect the abortable part.
+ elsif Is_RTE (Pdef, RO_CA_Delay_Until) then
+ Enqueue_Call :=
+ New_Reference_To (RTE (RE_Enqueue_Calendar), Loc);
- Hdle := New_List (
- Make_Exception_Handler (Loc,
- Exception_Choices =>
- New_List (New_Reference_To (Stand.Abort_Signal, Loc)),
- Statements => New_List (
- Make_Procedure_Call_Statement (Loc,
- Name => New_Reference_To (RTE (RE_Abort_Undefer), Loc)))));
+ else pragma Assert (Is_RTE (Pdef, RO_RT_Delay_Until));
+ Enqueue_Call := New_Reference_To (RTE (RE_Enqueue_RT), Loc);
+ end if;
- Prepend_To (Astats,
- Make_Procedure_Call_Statement (Loc,
- Name => New_Reference_To (RTE (RE_Abort_Undefer), Loc)));
+ Append_To (Parameter_Associations (Ecall),
+ Make_Attribute_Reference (Loc,
+ Prefix => New_Reference_To (Dblock_Ent, Loc),
+ Attribute_Name => Name_Unchecked_Access));
- Abortable_Block :=
- Make_Block_Statement (Loc,
- Identifier => New_Reference_To (Blkent, Loc),
- Handled_Statement_Sequence =>
- Make_Handled_Sequence_Of_Statements (Loc,
- Statements => Astats),
- Has_Created_Identifier => True,
- Is_Asynchronous_Call_Block => True);
+ -- Create the inner block to protect the abortable part
- -- Append call to if Enqueue (When, DB'Unchecked_Access) then
+ Hdle := New_List (
+ Make_Implicit_Exception_Handler (Loc,
+ Exception_Choices =>
+ New_List (New_Reference_To (Stand.Abort_Signal, Loc)),
+ Statements => New_List (
+ Make_Procedure_Call_Statement (Loc,
+ Name => New_Reference_To (RTE (RE_Abort_Undefer), Loc)))));
- Rewrite (Ecall,
- Make_Implicit_If_Statement (N,
- Condition => Make_Function_Call (Loc,
- Name => Enqueue_Call,
- Parameter_Associations => Parameter_Associations (Ecall)),
- Then_Statements =>
- New_List (Make_Block_Statement (Loc,
- Handled_Statement_Sequence =>
- Make_Handled_Sequence_Of_Statements (Loc,
- Statements => New_List (
- Make_Implicit_Label_Declaration (Loc,
- Defining_Identifier => Blkent,
- Label_Construct => Abortable_Block),
- Abortable_Block),
- Exception_Handlers => Hdle)))));
+ Prepend_To (Astats,
+ Make_Procedure_Call_Statement (Loc,
+ Name => New_Reference_To (RTE (RE_Abort_Undefer), Loc)));
- Stmts := New_List (Ecall);
+ Abortable_Block :=
+ Make_Block_Statement (Loc,
+ Identifier => New_Reference_To (Blk_Ent, Loc),
+ Handled_Statement_Sequence =>
+ Make_Handled_Sequence_Of_Statements (Loc,
+ Statements => Astats),
+ Has_Created_Identifier => True,
+ Is_Asynchronous_Call_Block => True);
- -- Construct statement sequence for new block
+ -- Append call to if Enqueue (When, DB'Unchecked_Access) then
- Append_To (Stmts,
- Make_Implicit_If_Statement (N,
- Condition => Make_Function_Call (Loc,
- Name => New_Reference_To (
- RTE (RE_Timed_Out), Loc),
- Parameter_Associations => New_List (
- Make_Attribute_Reference (Loc,
- Prefix => New_Reference_To (Dblock_Ent, Loc),
- Attribute_Name => Name_Unchecked_Access))),
- Then_Statements => Tstats));
+ Rewrite (Ecall,
+ Make_Implicit_If_Statement (N,
+ Condition => Make_Function_Call (Loc,
+ Name => Enqueue_Call,
+ Parameter_Associations => Parameter_Associations (Ecall)),
+ Then_Statements =>
+ New_List (Make_Block_Statement (Loc,
+ Handled_Statement_Sequence =>
+ Make_Handled_Sequence_Of_Statements (Loc,
+ Statements => New_List (
+ Make_Implicit_Label_Declaration (Loc,
+ Defining_Identifier => Blk_Ent,
+ Label_Construct => Abortable_Block),
+ Abortable_Block),
+ Exception_Handlers => Hdle)))));
+
+ Stmts := New_List (Ecall);
+
+ -- Construct statement sequence for new block
+
+ Append_To (Stmts,
+ Make_Implicit_If_Statement (N,
+ Condition => Make_Function_Call (Loc,
+ Name => New_Reference_To (
+ RTE (RE_Timed_Out), Loc),
+ Parameter_Associations => New_List (
+ Make_Attribute_Reference (Loc,
+ Prefix => New_Reference_To (Dblock_Ent, Loc),
+ Attribute_Name => Name_Unchecked_Access))),
+ Then_Statements => Tstats));
- -- The result is the new block
+ -- The result is the new block
- Set_Entry_Cancel_Parameter (Blkent, Dblock_Ent);
+ Set_Entry_Cancel_Parameter (Blk_Ent, Dblock_Ent);
- Rewrite (N,
- Make_Block_Statement (Loc,
- Declarations => New_List (
- Make_Object_Declaration (Loc,
- Defining_Identifier => Dblock_Ent,
- Aliased_Present => True,
- Object_Definition => New_Reference_To (
- RTE (RE_Delay_Block), Loc))),
+ Rewrite (N,
+ Make_Block_Statement (Loc,
+ Declarations => New_List (
+ Make_Object_Declaration (Loc,
+ Defining_Identifier => Dblock_Ent,
+ Aliased_Present => True,
+ Object_Definition => New_Reference_To (
+ RTE (RE_Delay_Block), Loc))),
- Handled_Statement_Sequence =>
- Make_Handled_Sequence_Of_Statements (Loc, Stmts)));
+ Handled_Statement_Sequence =>
+ Make_Handled_Sequence_Of_Statements (Loc, Stmts)));
- Analyze (N);
- return;
+ Analyze (N);
+ return;
+ end if;
else
N_Orig := N;
Decl := First (Decls);
while Present (Decl)
- and then (Nkind (Decl) /= N_Object_Declaration
- or else not Is_RTE
- (Etype (Object_Definition (Decl)), RE_Communication_Block))
+ and then
+ (Nkind (Decl) /= N_Object_Declaration
+ or else not Is_RTE (Etype (Object_Definition (Decl)),
+ RE_Communication_Block))
loop
Next (Decl);
end loop;
pragma Assert (Present (Decl));
Cancel_Param := Defining_Identifier (Decl);
- -- Change the mode of the Protected_Entry_Call call.
+ -- Change the mode of the Protected_Entry_Call call
+
-- Protected_Entry_Call (
-- Object => po._object'Access,
-- E => <entry index>;
Stmt := First (Stmts);
- -- Skip assignments to temporaries created for in-out parameters.
+ -- Skip assignments to temporaries created for in-out parameters
+
-- This makes unwarranted assumptions about the shape of the expanded
-- tree for the call, and should be cleaned up ???
Call := Stmt;
- Parm := First (Parameter_Associations (Call));
- while Present (Parm)
- and then not Is_RTE (Etype (Parm), RE_Call_Modes)
+ Param := First (Parameter_Associations (Call));
+ while Present (Param)
+ and then not Is_RTE (Etype (Param), RE_Call_Modes)
loop
- Next (Parm);
+ Next (Param);
end loop;
- pragma Assert (Present (Parm));
- Rewrite (Parm, New_Reference_To (RTE (RE_Asynchronous_Call), Loc));
- Analyze (Parm);
+ pragma Assert (Present (Param));
+ Rewrite (Param, New_Reference_To (RTE (RE_Asynchronous_Call), Loc));
+ Analyze (Param);
+
+ -- Append an if statement to execute the abortable part
- -- Append an if statement to execute the abortable part.
- -- if Enqueued (Bnn) then
+ -- Generate:
+ -- if Enqueued (Bnn) then
Append_To (Stmts,
Make_Implicit_If_Statement (N,
Abortable_Block :=
Make_Block_Statement (Loc,
- Identifier => New_Reference_To (Blkent, Loc),
+ Identifier => New_Reference_To (Blk_Ent, Loc),
Handled_Statement_Sequence =>
Make_Handled_Sequence_Of_Statements (Loc,
Statements => Stmts),
Has_Created_Identifier => True,
Is_Asynchronous_Call_Block => True);
- -- For the JVM call Update_Exception instead of Abort_Undefer.
+ -- For the VM call Update_Exception instead of Abort_Undefer.
-- See 4jexcept.ads for an explanation.
- if Hostparm.Java_VM then
+ if VM_Target = No_VM then
+ Target_Undefer := RE_Abort_Undefer;
+ else
Target_Undefer := RE_Update_Exception;
Undefer_Args :=
New_List (Make_Function_Call (Loc,
Name => New_Occurrence_Of
(RTE (RE_Current_Target_Exception), Loc)));
- else
- Target_Undefer := RE_Abort_Undefer;
end if;
Stmts := New_List (
Make_Handled_Sequence_Of_Statements (Loc,
Statements => New_List (
Make_Implicit_Label_Declaration (Loc,
- Defining_Identifier => Blkent,
+ Defining_Identifier => Blk_Ent,
Label_Construct => Abortable_Block),
Abortable_Block),
-- exception
Exception_Handlers => New_List (
- Make_Exception_Handler (Loc,
+ Make_Implicit_Exception_Handler (Loc,
-- when Abort_Signal =>
-- Abort_Undefer.all;
Defining_Identifier => Cancel_Param,
Object_Definition => New_Reference_To (Standard_Boolean, Loc)));
- -- Remove and save the call to Call_Simple.
+ -- Remove and save the call to Call_Simple
Stmt := First (Stmts);
Call := Stmt;
- -- Create the inner block to protect the abortable part.
+ -- Create the inner block to protect the abortable part
Hdle := New_List (
- Make_Exception_Handler (Loc,
+ Make_Implicit_Exception_Handler (Loc,
Exception_Choices =>
New_List (New_Reference_To (Stand.Abort_Signal, Loc)),
Statements => New_List (
Abortable_Block :=
Make_Block_Statement (Loc,
- Identifier => New_Reference_To (Blkent, Loc),
+ Identifier => New_Reference_To (Blk_Ent, Loc),
Handled_Statement_Sequence =>
Make_Handled_Sequence_Of_Statements (Loc,
Statements => Astats),
Make_Handled_Sequence_Of_Statements (Loc,
Statements => New_List (
Make_Implicit_Label_Declaration (Loc,
- Defining_Identifier => Blkent,
+ Defining_Identifier => Blk_Ent,
Label_Construct => Abortable_Block),
Abortable_Block),
Exception_Handlers => Hdle)));
-- Create new call statement
- Parms := Parameter_Associations (Call);
- Append_To (Parms, New_Reference_To (RTE (RE_Asynchronous_Call), Loc));
- Append_To (Parms, New_Reference_To (B, Loc));
+ Params := Parameter_Associations (Call);
+
+ Append_To (Params,
+ New_Reference_To (RTE (RE_Asynchronous_Call), Loc));
+ Append_To (Params,
+ New_Reference_To (B, Loc));
+
Rewrite (Call,
Make_Procedure_Call_Statement (Loc,
- Name => New_Reference_To (RTE (RE_Task_Entry_Call), Loc),
- Parameter_Associations => Parms));
+ Name =>
+ New_Reference_To (RTE (RE_Task_Entry_Call), Loc),
+ Parameter_Associations => Params));
-- Construct statement sequence for new block
Append_To (Stmts,
Make_Implicit_If_Statement (N,
- Condition => Make_Op_Not (Loc,
- New_Reference_To (Cancel_Param, Loc)),
+ Condition =>
+ Make_Op_Not (Loc,
+ New_Reference_To (Cancel_Param, Loc)),
Then_Statements => Tstats));
- -- Protected the call against abortion
+ -- Protected the call against abort
Prepend_To (Stmts,
Make_Procedure_Call_Statement (Loc,
Parameter_Associations => Empty_List));
end if;
- Set_Entry_Cancel_Parameter (Blkent, Cancel_Param);
+ Set_Entry_Cancel_Parameter (Blk_Ent, Cancel_Param);
-- The result is the new block
-- ...
-- end;
+ -- Ada 2005 (AI-345): A dispatching conditional entry call is converted
+ -- into:
+
+ -- declare
+ -- B : Boolean := False;
+ -- C : Ada.Tags.Prim_Op_Kind;
+ -- K : Ada.Tags.Tagged_Kind :=
+ -- Ada.Tags.Get_Tagged_Kind (Ada.Tags.Tag (<object>));
+ -- P : Parameters := (Param1 .. ParamN);
+ -- S : Integer;
+
+ -- begin
+ -- if K = Ada.Tags.TK_Limited_Tagged then
+ -- <dispatching-call>;
+ -- <triggering-statements>
+
+ -- else
+ -- S := Ada.Tags.Get_Offset_Index (Ada.Tags.Tag (<object>),
+ -- DT_Position (<dispatching-call>));
+
+ -- _Disp_Conditional_Select (<object>, S, P'address, C, B);
+
+ -- if C = POK_Protected_Entry
+ -- or else C = POK_Task_Entry
+ -- then
+ -- Param1 := P.Param1;
+ -- ...
+ -- ParamN := P.ParamN;
+ -- end if;
+
+ -- if B then
+ -- if C = POK_Procedure
+ -- or else C = POK_Protected_Procedure
+ -- or else C = POK_Task_Procedure
+ -- then
+ -- <dispatching-call>;
+ -- end if;
+
+ -- <triggering-statements>
+ -- else
+ -- <else-statements>
+ -- end if;
+ -- end if;
+ -- end;
+
procedure Expand_N_Conditional_Entry_Call (N : Node_Id) is
Loc : constant Source_Ptr := Sloc (N);
Alt : constant Node_Id := Entry_Call_Alternative (N);
Blk : Node_Id := Entry_Call_Statement (Alt);
Transient_Blk : Node_Id;
- Parms : List_Id;
- Parm : Node_Id;
- Call : Node_Id;
- Stmts : List_Id;
- B : Entity_Id;
- Decl : Node_Id;
- Stmt : Node_Id;
+ Actuals : List_Id;
+ Blk_Typ : Entity_Id;
+ Call : Node_Id;
+ Call_Ent : Entity_Id;
+ Conc_Typ_Stmts : List_Id;
+ Decl : Node_Id;
+ Decls : List_Id;
+ Formals : List_Id;
+ Lim_Typ_Stmts : List_Id;
+ N_Stats : List_Id;
+ Obj : Entity_Id;
+ Param : Node_Id;
+ Params : List_Id;
+ Stmt : Node_Id;
+ Stmts : List_Id;
+ Unpack : List_Id;
+
+ B : Entity_Id; -- Call status flag
+ C : Entity_Id; -- Call kind
+ K : Entity_Id; -- Tagged kind
+ P : Entity_Id; -- Parameter block
+ S : Entity_Id; -- Primitive operation slot
begin
+ if Ada_Version >= Ada_05
+ and then Nkind (Blk) = N_Procedure_Call_Statement
+ then
+ Extract_Dispatching_Call (Blk, Call_Ent, Obj, Actuals, Formals);
+
+ Decls := New_List;
+ Stmts := New_List;
+
+ -- Call status flag processing, generate:
+ -- B : Boolean := False;
+
+ B := Build_B (Loc, Decls);
+
+ -- Call kind processing, generate:
+ -- C : Ada.Tags.Prim_Op_Kind;
+
+ C := Build_C (Loc, Decls);
+
+ -- Tagged kind processing, generate:
+ -- K : Ada.Tags.Tagged_Kind :=
+ -- Ada.Tags.Get_Tagged_Kind (Ada.Tags.Tag (<object>));
+
+ K := Build_K (Loc, Decls, Obj);
+
+ -- Parameter block processing
+
+ Blk_Typ := Build_Parameter_Block (Loc, Actuals, Formals, Decls);
+ P := Parameter_Block_Pack
+ (Loc, Blk_Typ, Actuals, Formals, Decls, Stmts);
+
+ -- Dispatch table slot processing, generate:
+ -- S : Integer;
+
+ S := Build_S (Loc, Decls);
+
+ -- Generate:
+ -- S := Ada.Tags.Get_Offset_Index (
+ -- Ada.Tags.Tag (<object>), DT_Position (Call_Ent));
+
+ Conc_Typ_Stmts := New_List (
+ Build_S_Assignment (Loc, S, Obj, Call_Ent));
+
+ -- Generate:
+ -- _Disp_Conditional_Select (<object>, S, P'address, C, B);
+
+ Append_To (Conc_Typ_Stmts,
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (
+ Find_Prim_Op (Etype (Etype (Obj)),
+ Name_uDisp_Conditional_Select),
+ Loc),
+ Parameter_Associations =>
+ New_List (
+ New_Copy_Tree (Obj),
+ New_Reference_To (S, Loc),
+ Make_Attribute_Reference (Loc,
+ Prefix => New_Reference_To (P, Loc),
+ Attribute_Name => Name_Address),
+ New_Reference_To (C, Loc),
+ New_Reference_To (B, Loc))));
+
+ -- Generate:
+ -- if C = POK_Protected_Entry
+ -- or else C = POK_Task_Entry
+ -- then
+ -- Param1 := P.Param1;
+ -- ...
+ -- ParamN := P.ParamN;
+ -- end if;
+
+ Unpack := Parameter_Block_Unpack (Loc, P, Actuals, Formals);
+
+ -- Generate the if statement only when the packed parameters need
+ -- explicit assignments to their corresponding actuals.
+
+ if Present (Unpack) then
+ Append_To (Conc_Typ_Stmts,
+ Make_If_Statement (Loc,
+
+ Condition =>
+ Make_Or_Else (Loc,
+ Left_Opnd =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (
+ RE_POK_Protected_Entry), Loc)),
+ Right_Opnd =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (RE_POK_Task_Entry), Loc))),
+
+ Then_Statements =>
+ Unpack));
+ end if;
+
+ -- Generate:
+ -- if B then
+ -- if C = POK_Procedure
+ -- or else C = POK_Protected_Procedure
+ -- or else C = POK_Task_Procedure
+ -- then
+ -- <dispatching-call>
+ -- end if;
+ -- <normal-statements>
+ -- else
+ -- <else-statements>
+ -- end if;
+
+ N_Stats := New_Copy_List_Tree (Statements (Alt));
+
+ Prepend_To (N_Stats,
+ Make_If_Statement (Loc,
+ Condition =>
+ Make_Or_Else (Loc,
+ Left_Opnd =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (RE_POK_Procedure), Loc)),
+
+ Right_Opnd =>
+ Make_Or_Else (Loc,
+ Left_Opnd =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (
+ RE_POK_Protected_Procedure), Loc)),
+
+ Right_Opnd =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (
+ RE_POK_Task_Procedure), Loc)))),
+
+ Then_Statements =>
+ New_List (Blk)));
+
+ Append_To (Conc_Typ_Stmts,
+ Make_If_Statement (Loc,
+ Condition => New_Reference_To (B, Loc),
+ Then_Statements => N_Stats,
+ Else_Statements => Else_Statements (N)));
+
+ -- Generate:
+ -- <dispatching-call>;
+ -- <triggering-statements>
+
+ Lim_Typ_Stmts := New_Copy_List_Tree (Statements (Alt));
+ Prepend_To (Lim_Typ_Stmts, New_Copy_Tree (Blk));
+
+ -- Generate:
+ -- if K = Ada.Tags.TK_Limited_Tagged then
+ -- Lim_Typ_Stmts
+ -- else
+ -- Conc_Typ_Stmts
+ -- end if;
+
+ Append_To (Stmts,
+ Make_If_Statement (Loc,
+ Condition =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (K, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (RE_TK_Limited_Tagged), Loc)),
+
+ Then_Statements =>
+ Lim_Typ_Stmts,
+
+ Else_Statements =>
+ Conc_Typ_Stmts));
+
+ Rewrite (N,
+ Make_Block_Statement (Loc,
+ Declarations => Decls,
+ Handled_Statement_Sequence =>
+ Make_Handled_Sequence_Of_Statements (Loc, Stmts)));
+
-- As described above, The entry alternative is transformed into a
-- block that contains the gnulli call, and possibly assignment
-- statements for in-out parameters. The gnulli call may itself be
-- require it. We need to retrieve the call to complete its parameter
-- list.
- Transient_Blk :=
- First_Real_Statement (Handled_Statement_Sequence (Blk));
-
- if Present (Transient_Blk)
- and then
- Nkind (Transient_Blk) = N_Block_Statement
- then
- Blk := Transient_Blk;
- end if;
-
- Stmts := Statements (Handled_Statement_Sequence (Blk));
+ else
+ Transient_Blk :=
+ First_Real_Statement (Handled_Statement_Sequence (Blk));
- Stmt := First (Stmts);
+ if Present (Transient_Blk)
+ and then Nkind (Transient_Blk) = N_Block_Statement
+ then
+ Blk := Transient_Blk;
+ end if;
- while Nkind (Stmt) /= N_Procedure_Call_Statement loop
- Next (Stmt);
- end loop;
+ Stmts := Statements (Handled_Statement_Sequence (Blk));
+ Stmt := First (Stmts);
+ while Nkind (Stmt) /= N_Procedure_Call_Statement loop
+ Next (Stmt);
+ end loop;
- Call := Stmt;
+ Call := Stmt;
+ Params := Parameter_Associations (Call);
- Parms := Parameter_Associations (Call);
+ if Is_RTE (Entity (Name (Call)), RE_Protected_Entry_Call) then
- if Is_RTE (Entity (Name (Call)), RE_Protected_Entry_Call) then
+ -- Substitute Conditional_Entry_Call for Simple_Call parameter
- -- Substitute Conditional_Entry_Call for Simple_Call
- -- parameter.
+ Param := First (Params);
+ while Present (Param)
+ and then not Is_RTE (Etype (Param), RE_Call_Modes)
+ loop
+ Next (Param);
+ end loop;
- Parm := First (Parms);
- while Present (Parm)
- and then not Is_RTE (Etype (Parm), RE_Call_Modes)
- loop
- Next (Parm);
- end loop;
+ pragma Assert (Present (Param));
+ Rewrite (Param, New_Reference_To (RTE (RE_Conditional_Call), Loc));
- pragma Assert (Present (Parm));
- Rewrite (Parm, New_Reference_To (RTE (RE_Conditional_Call), Loc));
+ Analyze (Param);
- Analyze (Parm);
+ -- Find the Communication_Block parameter for the call to the
+ -- Cancelled function.
- -- Find the Communication_Block parameter for the call
- -- to the Cancelled function.
+ Decl := First (Declarations (Blk));
+ while Present (Decl)
+ and then not Is_RTE (Etype (Object_Definition (Decl)),
+ RE_Communication_Block)
+ loop
+ Next (Decl);
+ end loop;
- Decl := First (Declarations (Blk));
- while Present (Decl)
- and then not
- Is_RTE (Etype (Object_Definition (Decl)), RE_Communication_Block)
- loop
- Next (Decl);
- end loop;
+ -- Add an if statement to execute the else part if the call
+ -- does not succeed (as indicated by the Cancelled predicate).
- -- Add an if statement to execute the else part if the call
- -- does not succeed (as indicated by the Cancelled predicate).
+ Append_To (Stmts,
+ Make_Implicit_If_Statement (N,
+ Condition => Make_Function_Call (Loc,
+ Name => New_Reference_To (RTE (RE_Cancelled), Loc),
+ Parameter_Associations => New_List (
+ New_Reference_To (Defining_Identifier (Decl), Loc))),
+ Then_Statements => Else_Statements (N),
+ Else_Statements => Statements (Alt)));
- Append_To (Stmts,
- Make_Implicit_If_Statement (N,
- Condition => Make_Function_Call (Loc,
- Name => New_Reference_To (RTE (RE_Cancelled), Loc),
- Parameter_Associations => New_List (
- New_Reference_To (Defining_Identifier (Decl), Loc))),
- Then_Statements => Else_Statements (N),
- Else_Statements => Statements (Alt)));
+ else
+ B := Make_Defining_Identifier (Loc, Name_uB);
- else
- B := Make_Defining_Identifier (Loc, Name_uB);
+ -- Insert declaration of B in declarations of existing block
- -- Insert declaration of B in declarations of existing block
+ if No (Declarations (Blk)) then
+ Set_Declarations (Blk, New_List);
+ end if;
- if No (Declarations (Blk)) then
- Set_Declarations (Blk, New_List);
- end if;
+ Prepend_To (Declarations (Blk),
+ Make_Object_Declaration (Loc,
+ Defining_Identifier => B,
+ Object_Definition =>
+ New_Reference_To (Standard_Boolean, Loc)));
- Prepend_To (Declarations (Blk),
- Make_Object_Declaration (Loc,
- Defining_Identifier => B,
- Object_Definition => New_Reference_To (Standard_Boolean, Loc)));
+ -- Create new call statement
- -- Create new call statement
+ Append_To (Params,
+ New_Reference_To (RTE (RE_Conditional_Call), Loc));
+ Append_To (Params, New_Reference_To (B, Loc));
- Append_To (Parms, New_Reference_To (RTE (RE_Conditional_Call), Loc));
- Append_To (Parms, New_Reference_To (B, Loc));
+ Rewrite (Call,
+ Make_Procedure_Call_Statement (Loc,
+ Name => New_Reference_To (RTE (RE_Task_Entry_Call), Loc),
+ Parameter_Associations => Params));
- Rewrite (Call,
- Make_Procedure_Call_Statement (Loc,
- Name => New_Reference_To (RTE (RE_Task_Entry_Call), Loc),
- Parameter_Associations => Parms));
+ -- Construct statement sequence for new block
- -- Construct statement sequence for new block
+ Append_To (Stmts,
+ Make_Implicit_If_Statement (N,
+ Condition => New_Reference_To (B, Loc),
+ Then_Statements => Statements (Alt),
+ Else_Statements => Else_Statements (N)));
+ end if;
- Append_To (Stmts,
- Make_Implicit_If_Statement (N,
- Condition => New_Reference_To (B, Loc),
- Then_Statements => Statements (Alt),
- Else_Statements => Else_Statements (N)));
+ -- The result is the new block
+ Rewrite (N,
+ Make_Block_Statement (Loc,
+ Declarations => Declarations (Blk),
+ Handled_Statement_Sequence =>
+ Make_Handled_Sequence_Of_Statements (Loc, Stmts)));
end if;
- -- The result is the new block
-
- Rewrite (N,
- Make_Block_Statement (Loc,
- Declarations => Declarations (Blk),
- Handled_Statement_Sequence =>
- Make_Handled_Sequence_Of_Statements (Loc, Stmts)));
-
Analyze (N);
end Expand_N_Conditional_Entry_Call;
procedure Expand_N_Delay_Relative_Statement (N : Node_Id) is
Loc : constant Source_Ptr := Sloc (N);
-
begin
Rewrite (N,
Make_Procedure_Call_Statement (Loc,
Index_Decl : List_Id;
begin
- -- Add the renamings for private declarations and discriminants.
+ -- Add the renamings for private declarations and discriminants
Add_Discriminal_Declarations
(Declarations (N), Defining_Identifier (Dec), Name_uObject, Loc);
end if;
end if;
- -- 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.
+ -- 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);
return;
end if;
- -- If this entry call is part of an asynchronous select, don't
- -- expand it here; it will be expanded with the select statement.
- -- Don't expand timed entry calls either, as they are translated
- -- into asynchronous entry calls.
+ -- If this entry call is part of an asynchronous select, don't expand it
+ -- here; it will be expanded with the select statement. Don't expand
+ -- timed entry calls either, as they are translated into asynchronous
+ -- entry calls.
- -- ??? This whole approach is questionable; it may be better
- -- to go back to allowing the expansion to take place and then
- -- attempting to fix it up in Expand_N_Asynchronous_Select.
- -- The tricky part is figuring out whether the expanded
- -- call is on a task or protected entry.
+ -- ??? This whole approach is questionable; it may be better to go back
+ -- to allowing the expansion to take place and then attempting to fix it
+ -- up in Expand_N_Asynchronous_Select. The tricky part is figuring out
+ -- whether the expanded call is on a task or protected entry.
if (Nkind (Parent (N)) /= N_Triggering_Alternative
or else N /= Triggering_Statement (Parent (N)))
-- Expand_N_Entry_Declaration --
--------------------------------
- -- If there are parameters, then first, each of the formals is marked
- -- by setting Is_Entry_Formal. Next a record type is built which is
- -- used to hold the parameter values. The name of this record type is
- -- entryP where entry is the name of the entry, with an additional
- -- corresponding access type called entryPA. The record type has matching
- -- components for each formal (the component names are the same as the
- -- formal names). For elementary types, the component type matches the
- -- formal type. For composite types, an access type is declared (with
- -- the name formalA) which designates the formal type, and the type of
- -- the component is this access type. Finally the Entry_Component of
- -- each formal is set to reference the corresponding record component.
+ -- If there are parameters, then first, each of the formals is marked by
+ -- setting Is_Entry_Formal. Next a record type is built which is used to
+ -- hold the parameter values. The name of this record type is entryP where
+ -- entry is the name of the entry, with an additional corresponding access
+ -- type called entryPA. The record type has matching components for each
+ -- formal (the component names are the same as the formal names). For
+ -- elementary types, the component type matches the formal type. For
+ -- composite types, an access type is declared (with the name formalA)
+ -- which designates the formal type, and the type of the component is this
+ -- access type. Finally the Entry_Component of each formal is set to
+ -- reference the corresponding record component.
procedure Expand_N_Entry_Declaration (N : Node_Id) is
Loc : constant Source_Ptr := Sloc (N);
-----------------------------
-- Protected bodies are expanded to the completion of the subprograms
- -- created for the corresponding protected type. These are a protected
- -- and unprotected version of each protected subprogram in the object,
- -- a function to calculate each entry barrier, and a procedure to
- -- execute the sequence of statements of each protected entry body.
- -- For example, for protected type ptype:
+ -- created for the corresponding protected type. These are a protected and
+ -- unprotected version of each protected subprogram in the object, a
+ -- function to calculate each entry barrier, and a procedure to execute the
+ -- sequence of statements of each protected entry body. For example, for
+ -- protected type ptype:
-- function entB
-- (O : System.Address;
-- <sequence of statements>
-- end pprocN;
- -- procedure pproc (_object : in out poV;...) is
+ -- procedure pprocP (_object : in out poV;...) is
-- procedure _clean is
-- Pn : Boolean;
-- begin
-- <sequence of statements>
-- end pfuncN;
- -- function pfunc (_object : poV) return Return_Type is
+ -- function pfuncP (_object : poV) return Return_Type is
-- procedure _clean is
-- begin
-- Unlock (_object._object'Access);
-- the state of the protected object.
procedure Expand_N_Protected_Body (N : Node_Id) is
+ Loc : constant Source_Ptr := Sloc (N);
Pid : constant Entity_Id := Corresponding_Spec (N);
Has_Entries : Boolean := False;
- Op_Decl : Node_Id;
Op_Body : Node_Id;
+ Op_Decl : Node_Id;
Op_Id : Entity_Id;
+ Disp_Op_Body : Node_Id;
New_Op_Body : Node_Id;
Current_Node : Node_Id;
Num_Entries : Natural := 0;
+ function Build_Dispatching_Subprogram_Body
+ (N : Node_Id;
+ Pid : Node_Id;
+ Prot_Bod : Node_Id) return Node_Id;
+ -- Build a dispatching version of the protected subprogram body. The
+ -- newly generated subprogram contains a call to the original protected
+ -- body. The following code is generated:
+ --
+ -- function <protected-function-name> (Param1 .. ParamN) return
+ -- <return-type> is
+ -- begin
+ -- return <protected-function-name>P (Param1 .. ParamN);
+ -- end <protected-function-name>;
+ --
+ -- or
+ --
+ -- procedure <protected-procedure-name> (Param1 .. ParamN) is
+ -- begin
+ -- <protected-procedure-name>P (Param1 .. ParamN);
+ -- end <protected-procedure-name>
+
+ ---------------------------------------
+ -- Build_Dispatching_Subprogram_Body --
+ ---------------------------------------
+
+ function Build_Dispatching_Subprogram_Body
+ (N : Node_Id;
+ Pid : Node_Id;
+ Prot_Bod : Node_Id) return Node_Id
+ is
+ Loc : constant Source_Ptr := Sloc (N);
+ Actuals : List_Id;
+ Formal : Node_Id;
+ Spec : Node_Id;
+ Stmts : List_Id;
+
+ begin
+ -- Generate a specification without a letter suffix in order to
+ -- override an interface function or procedure.
+
+ Spec :=
+ Build_Protected_Sub_Specification (N, Pid, Dispatching_Mode);
+
+ -- The formal parameters become the actuals of the protected
+ -- function or procedure call.
+
+ Actuals := New_List;
+ Formal := First (Parameter_Specifications (Spec));
+ while Present (Formal) loop
+ Append_To (Actuals,
+ Make_Identifier (Loc, Chars (Defining_Identifier (Formal))));
+
+ Next (Formal);
+ end loop;
+
+ if Nkind (Spec) = N_Procedure_Specification then
+ Stmts :=
+ New_List (
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (Corresponding_Spec (Prot_Bod), Loc),
+ Parameter_Associations => Actuals));
+ else
+ pragma Assert (Nkind (Spec) = N_Function_Specification);
+
+ Stmts :=
+ New_List (
+ Make_Return_Statement (Loc,
+ Expression =>
+ Make_Function_Call (Loc,
+ Name =>
+ New_Reference_To (Corresponding_Spec (Prot_Bod), Loc),
+ Parameter_Associations => Actuals)));
+ end if;
+
+ return
+ Make_Subprogram_Body (Loc,
+ Declarations => Empty_List,
+ Specification => Spec,
+ Handled_Statement_Sequence =>
+ Make_Handled_Sequence_Of_Statements (Loc, Stmts));
+ end Build_Dispatching_Subprogram_Body;
+
+ -- Start of processing for Expand_N_Protected_Body
+
begin
if No_Run_Time_Mode then
Error_Msg_CRT ("protected body", N);
when N_Subprogram_Body =>
- -- Exclude functions created to analyze defaults.
+ -- Exclude functions created to analyze defaults
if not Is_Eliminated (Defining_Entity (Op_Body))
and then not Is_Eliminated (Corresponding_Spec (Op_Body))
New_Op_Body :=
Build_Unprotected_Subprogram_Body (Op_Body, Pid);
+ -- Propagate the finalization chain to the new body.
+ -- In the unlikely event that the subprogram contains a
+ -- declaration or allocator for an object that requires
+ -- finalization, the corresponding chain is created when
+ -- analyzing the body, and attached to its entity. This
+ -- entity is not further elaborated, and so the chain
+ -- properly belongs to the newly created subprogram body.
+
+ if Present
+ (Finalization_Chain_Entity (Defining_Entity (Op_Body)))
+ then
+ Set_Finalization_Chain_Entity
+ (Protected_Body_Subprogram
+ (Corresponding_Spec (Op_Body)),
+ Finalization_Chain_Entity (Defining_Entity (Op_Body)));
+ Set_Analyzed
+ (Handled_Statement_Sequence (New_Op_Body), False);
+ end if;
+
Insert_After (Current_Node, New_Op_Body);
Current_Node := New_Op_Body;
Analyze (New_Op_Body);
Update_Prival_Subtypes (New_Op_Body);
- -- Build the corresponding protected operation only if
- -- this is a visible operation of the type, or if it is
- -- an interrupt handler. Otherwise it is only callable
- -- from within the object, and the unprotected version
- -- is sufficient.
+ -- Build the corresponding protected operation. It may
+ -- appear that this is needed only this is a visible
+ -- operation of the type, or if it is an interrupt handler,
+ -- and this was the strategy used previously in GNAT.
+ -- However, the operation may be exported through a
+ -- 'Access to an external caller. This is the common idiom
+ -- in code that uses the Ada 2005 Timing_Events package
+ -- As a result we need to produce the protected body for
+ -- both visible and private operations.
if Present (Corresponding_Spec (Op_Body)) then
Op_Decl :=
- Unit_Declaration_Node (Corresponding_Spec (Op_Body));
-
- if Nkind (Parent (Op_Decl)) = N_Protected_Definition
- and then
- (List_Containing (Op_Decl) =
- Visible_Declarations (Parent (Op_Decl))
- or else
- Is_Interrupt_Handler
- (Corresponding_Spec (Op_Body)))
+ Unit_Declaration_Node (Corresponding_Spec (Op_Body));
+
+ if
+ Nkind (Parent (Op_Decl)) = N_Protected_Definition
then
New_Op_Body :=
Build_Protected_Subprogram_Body (
Insert_After (Current_Node, New_Op_Body);
Analyze (New_Op_Body);
+
+ Current_Node := New_Op_Body;
+
+ -- Generate an overriding primitive operation body for
+ -- this subprogram if the protected type implements
+ -- an interface.
+
+ if Ada_Version >= Ada_05
+ and then Present (Abstract_Interfaces (
+ Corresponding_Record_Type (Pid)))
+ then
+ Disp_Op_Body :=
+ Build_Dispatching_Subprogram_Body (
+ Op_Body, Pid, New_Op_Body);
+
+ Insert_After (Current_Node, Disp_Op_Body);
+ Analyze (Disp_Op_Body);
+
+ Current_Node := Disp_Op_Body;
+ end if;
end if;
end if;
end if;
if Has_Entries
and then (Abort_Allowed
- or else Restriction_Active (No_Entry_Queue) = False
- or else Num_Entries > 1)
+ or else Restriction_Active (No_Entry_Queue) = False
+ or else Num_Entries > 1
+ or else (Has_Attach_Handler (Pid)
+ and then not Restricted_Profile))
then
New_Op_Body := Build_Find_Body_Index (Pid);
Insert_After (Current_Node, New_Op_Body);
+ Current_Node := New_Op_Body;
Analyze (New_Op_Body);
end if;
+
+ -- Ada 2005 (AI-345): Construct the primitive entry wrapper bodies after
+ -- the protected body. At this point the entry specs have been created,
+ -- frozen and included in the dispatch table for the protected type.
+
+ pragma Assert (Present (Corresponding_Record_Type (Pid)));
+
+ if Ada_Version >= Ada_05
+ and then Present (Protected_Definition (Parent (Pid)))
+ and then Present (Abstract_Interfaces
+ (Corresponding_Record_Type (Pid)))
+ then
+ declare
+ Vis_Decl : Node_Id :=
+ First (Visible_Declarations
+ (Protected_Definition (Parent (Pid))));
+ Wrap_Body : Node_Id;
+
+ begin
+ -- Examine the visible declarations of the protected type, looking
+ -- for an entry declaration. We do not consider entry families
+ -- since they cannot have dispatching operations, thus they do not
+ -- need entry wrappers.
+
+ while Present (Vis_Decl) loop
+ if Nkind (Vis_Decl) = N_Entry_Declaration then
+ Wrap_Body :=
+ Build_Wrapper_Body (Loc,
+ Proc_Nam => Defining_Identifier (Vis_Decl),
+ Obj_Typ => Corresponding_Record_Type (Pid),
+ Formals => Parameter_Specifications (Vis_Decl));
+
+ if Wrap_Body /= Empty then
+ Insert_After (Current_Node, Wrap_Body);
+ Current_Node := Wrap_Body;
+
+ Analyze (Wrap_Body);
+ end if;
+
+ elsif Nkind (Vis_Decl) = N_Subprogram_Declaration then
+ Wrap_Body :=
+ Build_Wrapper_Body (Loc,
+ Proc_Nam => Defining_Unit_Name
+ (Specification (Vis_Decl)),
+ Obj_Typ => Corresponding_Record_Type (Pid),
+ Formals => Parameter_Specifications
+ (Specification (Vis_Decl)));
+
+ if Wrap_Body /= Empty then
+ Insert_After (Current_Node, Wrap_Body);
+ Current_Node := Wrap_Body;
+
+ Analyze (Wrap_Body);
+ end if;
+ end if;
+
+ Next (Vis_Decl);
+ end loop;
+ end;
+ end if;
end Expand_N_Protected_Body;
-----------------------------------------
-- <private data fields>
-- end record;
- -- The discriminants are present only if the corresponding protected
- -- type has discriminants, and they exactly mirror the protected type
- -- discriminants. The private data fields similarly mirror the
- -- private declarations of the protected type.
+ -- The discriminants are present only if the corresponding protected type
+ -- has discriminants, and they exactly mirror the protected type
+ -- discriminants. The private data fields similarly mirror the private
+ -- declarations of the protected type.
- -- The Object field is always present. It contains RTS specific data
- -- used to control the protected object. It is declared as Aliased
- -- so that it can be passed as a pointer to the RTS. This allows the
- -- protected record to be referenced within RTS data structures.
- -- An appropriate Protection type and discriminant are generated.
+ -- The Object field is always present. It contains RTS specific data used
+ -- to control the protected object. It is declared as Aliased so that it
+ -- can be passed as a pointer to the RTS. This allows the protected record
+ -- to be referenced within RTS data structures. An appropriate Protection
+ -- type and discriminant are generated.
-- The Service field is present for protected objects with entries. It
- -- contains sufficient information to allow the entry service procedure
- -- for this object to be called when the object is not known till runtime.
+ -- contains sufficient information to allow the entry service procedure for
+ -- this object to be called when the object is not known till runtime.
-- One entry_family component is present for each entry family in the
-- task definition (see Expand_N_Task_Type_Declaration).
-- When a protected object is declared, an instance of the protected type
- -- value record is created. The elaboration of this declaration creates
- -- the correct bounds for the entry families, and also evaluates the
- -- priority expression if needed. The initialization routine for
- -- the protected type itself then calls Initialize_Protection with
- -- appropriate parameters to initialize the value of the Task_Id field.
- -- Install_Handlers may be also called if a pragma Attach_Handler applies.
-
- -- Note: this record is passed to the subprograms created by the
- -- expansion of protected subprograms and entries. It is an in parameter
- -- to protected functions and an in out parameter to procedures and
- -- entry bodies. The Entity_Id for this created record type is placed
- -- in the Corresponding_Record_Type field of the associated protected
- -- type entity.
-
- -- Next we create a procedure specifications for protected subprograms
- -- and entry bodies. For each protected subprograms two subprograms are
- -- created, an unprotected and a protected version. The unprotected
- -- version is called from within other operations of the same protected
- -- object.
+ -- value record is created. The elaboration of this declaration creates the
+ -- correct bounds for the entry families, and also evaluates the priority
+ -- expression if needed. The initialization routine for the protected type
+ -- itself then calls Initialize_Protection with appropriate parameters to
+ -- initialize the value of the Task_Id field. Install_Handlers may be also
+ -- called if a pragma Attach_Handler applies.
+
+ -- Note: this record is passed to the subprograms created by the expansion
+ -- of protected subprograms and entries. It is an in parameter to protected
+ -- functions and an in out parameter to procedures and entry bodies. The
+ -- Entity_Id for this created record type is placed in the
+ -- Corresponding_Record_Type field of the associated protected type entity.
+
+ -- Next we create a procedure specifications for protected subprograms and
+ -- entry bodies. For each protected subprograms two subprograms are
+ -- created, an unprotected and a protected version. The unprotected version
+ -- is called from within other operations of the same protected object.
-- We also build the call to register the procedure if a pragma
-- Interrupt_Handler applies.
-- A single subprogram is created to service all entry bodies; it has an
- -- additional boolean out parameter indicating that the previous entry
- -- call made by the current task was serviced immediately, i.e. not by
- -- proxy. The O parameter contains a pointer to a record object of the
- -- type described above. An untyped interface is used here to allow this
+ -- additional boolean out parameter indicating that the previous entry call
+ -- made by the current task was serviced immediately, i.e. not by proxy.
+ -- The O parameter contains a pointer to a record object of the type
+ -- described above. An untyped interface is used here to allow this
-- procedure to be called in places where the type of the object to be
- -- serviced is not known. This must be done, for example, when a call
- -- that may have been requeued is cancelled; the corresponding object
- -- must be serviced, but which object that is not known till runtime.
+ -- serviced is not known. This must be done, for example, when a call that
+ -- may have been requeued is cancelled; the corresponding object must be
+ -- serviced, but which object that is not known till runtime.
-- procedure ptypeS
-- (O : System.Address; P : out Boolean);
procedure Expand_N_Protected_Type_Declaration (N : Node_Id) is
Loc : constant Source_Ptr := Sloc (N);
Prottyp : constant Entity_Id := Defining_Identifier (N);
- Protnm : constant Name_Id := Chars (Prottyp);
- Pdef : constant Node_Id := Protected_Definition (N);
+ Pdef : constant Node_Id := Protected_Definition (N);
-- This contains two lists; one for visible and one for private decls
Rec_Decl : Node_Id;
Cdecls : List_Id;
Discr_Map : constant Elist_Id := New_Elmt_List;
Priv : Node_Id;
- Pent : Entity_Id;
New_Priv : Node_Id;
Comp : Node_Id;
Comp_Id : Entity_Id;
Object_Comp : Node_Id;
procedure Register_Handler;
- -- for a protected operation that is an interrupt handler, add the
+ -- For a protected operation that is an interrupt handler, add the
-- freeze action that will register it as such.
----------------------
return;
else
Rec_Decl := Build_Corresponding_Record (N, Prottyp, Loc);
- Cdecls := Component_Items
- (Component_List (Type_Definition (Rec_Decl)));
end if;
+ Cdecls := Component_Items (Component_List (Type_Definition (Rec_Decl)));
+
+ -- Ada 2005 (AI-345): Propagate the attribute that contains the list
+ -- of implemented interfaces.
+
+ Set_Interface_List (Type_Definition (Rec_Decl), Interface_List (N));
+
Qualify_Entity_Names (N);
-- If the type has discriminants, their occurrences in the declaration
-- corresponding record type must refer to the discriminants of that
-- record, so we must apply a new renaming to subtypes_indications:
- -- protected discriminant => discriminal => record discriminant.
+ -- protected discriminant => discriminal => record discriminant
+
-- This replacement is not applied to default expressions, for which
-- the discriminal is correct.
declare
Disc : Entity_Id;
Decl : Node_Id;
-
begin
Disc := First_Discriminant (Prottyp);
Decl := First (Discriminant_Specifications (Rec_Decl));
-
while Present (Disc) loop
Append_Elmt (Discriminal (Disc), Discr_Map);
Append_Elmt (Defining_Identifier (Decl), Discr_Map);
-- Fill in the component declarations
- -- Add components for entry families. For each entry family,
- -- create an anonymous type declaration with the same size, and
- -- analyze the type.
+ -- Add components for entry families. For each entry family, create an
+ -- anonymous type declaration with the same size, and analyze the type.
Collect_Entry_Families (Loc, Cdecls, Current_Node, Prottyp);
- -- Prepend the _Object field with the right type to the component
- -- list. We need to compute the number of entries, and in some cases
- -- the number of Attach_Handler pragmas.
+ -- Prepend the _Object field with the right type to the component list.
+ -- We need to compute the number of entries, and in some cases the
+ -- number of Attach_Handler pragmas.
declare
Ritem : Node_Id;
Sloc => Loc,
Constraints => New_List (Entry_Count_Expr)));
- elsif Has_Entries (Prottyp) then
+ -- Type has explicit entries or generated primitive entry wrappers
+
+ elsif Has_Entries (Prottyp)
+ or else (Ada_Version >= Ada_05
+ and then Present (Interface_List (N)))
+ then
if Abort_Allowed
or else Restriction_Active (No_Entry_Queue) = False
or else Number_Entries (Prottyp) > 1
while Present (Priv) loop
- if Nkind (Priv) = N_Component_Declaration then
- Pent := Defining_Identifier (Priv);
- New_Priv :=
- Make_Component_Declaration (Loc,
- Defining_Identifier =>
- Make_Defining_Identifier (Sloc (Pent), Chars (Pent)),
- Component_Definition =>
- Make_Component_Definition (Sloc (Pent),
- Aliased_Present => False,
- Subtype_Indication =>
- New_Copy_Tree (Subtype_Indication
- (Component_Definition (Priv)),
- Discr_Map)),
- Expression => Expression (Priv));
+ if Nkind (Priv) = N_Component_Declaration then
+
+ -- The component definition consists of a subtype indication,
+ -- or (in Ada 2005) an access definition. Make a copy of the
+ -- proper definition.
+
+ declare
+ Old_Comp : constant Node_Id := Component_Definition (Priv);
+ Pent : constant Entity_Id := Defining_Identifier (Priv);
+ New_Comp : Node_Id;
+
+ begin
+ if Present (Subtype_Indication (Old_Comp)) then
+ New_Comp :=
+ Make_Component_Definition (Sloc (Pent),
+ Aliased_Present => False,
+ Subtype_Indication =>
+ New_Copy_Tree (Subtype_Indication (Old_Comp),
+ Discr_Map));
+ else
+ New_Comp :=
+ Make_Component_Definition (Sloc (Pent),
+ Aliased_Present => False,
+ Access_Definition =>
+ New_Copy_Tree (Access_Definition (Old_Comp),
+ Discr_Map));
+ end if;
+
+ New_Priv :=
+ Make_Component_Declaration (Loc,
+ Defining_Identifier =>
+ Make_Defining_Identifier (Sloc (Pent), Chars (Pent)),
+ Component_Definition => New_Comp,
+ Expression => Expression (Priv));
- Append_To (Cdecls, New_Priv);
+ Append_To (Cdecls, New_Priv);
+ end;
elsif Nkind (Priv) = N_Subprogram_Declaration then
Make_Subprogram_Declaration (Loc,
Specification =>
Build_Protected_Sub_Specification
- (Priv, Prottyp, Unprotected => True));
+ (Priv, Prottyp, Unprotected_Mode));
Insert_After (Current_Node, Sub);
Analyze (Sub);
Defining_Unit_Name (Specification (Sub)));
Current_Node := Sub;
+
+ Sub :=
+ Make_Subprogram_Declaration (Loc,
+ Specification =>
+ Build_Protected_Sub_Specification
+ (Priv, Prottyp, Protected_Mode));
+
+ Insert_After (Current_Node, Sub);
+ Analyze (Sub);
+ Current_Node := Sub;
+
if Is_Interrupt_Handler
(Defining_Unit_Name (Specification (Priv)))
then
- Sub :=
- Make_Subprogram_Declaration (Loc,
- Specification =>
- Build_Protected_Sub_Specification
- (Priv, Prottyp, Unprotected => False));
-
- Insert_After (Current_Node, Sub);
- Analyze (Sub);
- Current_Node := Sub;
-
if not Restricted_Profile then
Register_Handler;
end if;
Analyze (Rec_Decl, Suppress => All_Checks);
+ -- Ada 2005 (AI-345): Construct the primitive entry wrappers before
+ -- the corresponding record is frozen
+
+ if Ada_Version >= Ada_05
+ and then Present (Visible_Declarations (Pdef))
+ and then Present (Corresponding_Record_Type
+ (Defining_Identifier (Parent (Pdef))))
+ and then Present (Abstract_Interfaces
+ (Corresponding_Record_Type
+ (Defining_Identifier (Parent (Pdef)))))
+ then
+ declare
+ Current_Node : Node_Id := Rec_Decl;
+ Vis_Decl : Node_Id;
+ Wrap_Spec : Node_Id;
+ New_N : Node_Id;
+
+ begin
+ -- Examine the visible declarations of the protected type, looking
+ -- for declarations of entries, and subprograms. We do not
+ -- consider entry families since they cannot have dispatching
+ -- operations, thus they do not need entry wrappers.
+
+ Vis_Decl := First (Visible_Declarations (Pdef));
+
+ while Present (Vis_Decl) loop
+
+ Wrap_Spec := Empty;
+
+ if Nkind (Vis_Decl) = N_Entry_Declaration
+ and then No (Discrete_Subtype_Definition (Vis_Decl))
+ then
+ Wrap_Spec :=
+ Build_Wrapper_Spec (Loc,
+ Proc_Nam => Defining_Identifier (Vis_Decl),
+ Obj_Typ => Defining_Identifier (Rec_Decl),
+ Formals => Parameter_Specifications (Vis_Decl));
+
+ elsif Nkind (Vis_Decl) = N_Subprogram_Declaration then
+ Wrap_Spec :=
+ Build_Wrapper_Spec (Loc,
+ Proc_Nam => Defining_Unit_Name
+ (Specification (Vis_Decl)),
+ Obj_Typ => Defining_Identifier (Rec_Decl),
+ Formals => Parameter_Specifications
+ (Specification (Vis_Decl)));
+
+ end if;
+
+ if Wrap_Spec /= Empty then
+ New_N := Make_Subprogram_Declaration (Loc,
+ Specification => Wrap_Spec);
+
+ Insert_After (Current_Node, New_N);
+ Current_Node := New_N;
+
+ Analyze (New_N);
+ end if;
+
+ Next (Vis_Decl);
+ end loop;
+ end;
+ end if;
+
-- Collect pointers to entry bodies and their barriers, to be placed
-- in the Entry_Bodies_Array for the type. For each entry/family we
-- add an expression to the aggregate which is the initial value of
Entries_Aggr := Empty;
end if;
- -- Build two new procedure specifications for each protected
- -- subprogram; one to call from outside the object and one to
- -- call from inside. Build a barrier function and an entry
- -- body action procedure specification for each protected entry.
- -- Initialize the entry body array. If subprogram is flagged as
- -- eliminated, do not generate any internal operations.
+ -- Build two new procedure specifications for each protected subprogram;
+ -- one to call from outside the object and one to call from inside.
+ -- Build a barrier function and an entry body action procedure
+ -- specification for each protected entry. Initialize the entry body
+ -- array. If subprogram is flagged as eliminated, do not generate any
+ -- internal operations.
E_Count := 0;
Make_Subprogram_Declaration (Loc,
Specification =>
Build_Protected_Sub_Specification
- (Comp, Prottyp, Unprotected => True));
+ (Comp, Prottyp, Unprotected_Mode));
Insert_After (Current_Node, Sub);
Analyze (Sub);
(Defining_Unit_Name (Specification (Comp)),
Defining_Unit_Name (Specification (Sub)));
- -- Make the protected version of the subprogram available
- -- for expansion of external calls.
+ -- Make the protected version of the subprogram available for
+ -- expansion of external calls.
Current_Node := Sub;
Make_Subprogram_Declaration (Loc,
Specification =>
Build_Protected_Sub_Specification
- (Comp, Prottyp, Unprotected => False));
+ (Comp, Prottyp, Protected_Mode));
Insert_After (Current_Node, Sub);
Analyze (Sub);
+
Current_Node := Sub;
- -- If a pragma Interrupt_Handler applies, build and add
- -- a call to Register_Interrupt_Handler to the freezing actions
- -- of the protected version (Current_Node) of the subprogram:
+ -- Generate an overriding primitive operation specification for
+ -- this subprogram if the protected type implements an inerface.
+
+ if Ada_Version >= Ada_05
+ and then
+ Present (Abstract_Interfaces
+ (Corresponding_Record_Type (Prottyp)))
+ then
+ Sub :=
+ Make_Subprogram_Declaration (Loc,
+ Specification =>
+ Build_Protected_Sub_Specification
+ (Comp, Prottyp, Dispatching_Mode));
+
+ Insert_After (Current_Node, Sub);
+ Analyze (Sub);
+
+ Current_Node := Sub;
+ end if;
+
+ -- If a pragma Interrupt_Handler applies, build and add a call to
+ -- Register_Interrupt_Handler to the freezing actions of the
+ -- protected version (Current_Node) of the subprogram:
+
-- system.interrupts.register_interrupt_handler
-- (prot_procP'address);
if not Restricted_Profile
and then Is_Interrupt_Handler
- (Defining_Unit_Name (Specification (Comp)))
+ (Defining_Unit_Name (Specification (Comp)))
then
Register_Handler;
end if;
Set_Privals_Chain (Comp_Id, New_Elmt_List);
Edef :=
Make_Defining_Identifier (Loc,
- Build_Selected_Name
- (Protnm,
- New_External_Name (Chars (Comp_Id), Suffix_Index => -1),
- 'E'));
+ Build_Selected_Name (Prottyp, Comp_Id, 'E'));
Sub :=
Make_Subprogram_Declaration (Loc,
Specification =>
Bdef :=
Make_Defining_Identifier (Loc,
- Build_Selected_Name
- (Protnm,
- New_External_Name (Chars (Comp_Id), Suffix_Index => -1),
- 'B'));
+ Build_Selected_Name (Prottyp, Comp_Id, 'B'));
Sub :=
Make_Subprogram_Declaration (Loc,
Specification =>
if Present (Private_Declarations (Pdef)) then
Comp := First (Private_Declarations (Pdef));
-
while Present (Comp) loop
if Nkind (Comp) = N_Entry_Declaration then
E_Count := E_Count + 1;
Set_Privals_Chain (Comp_Id, New_Elmt_List);
Edef :=
Make_Defining_Identifier (Loc,
- Build_Selected_Name
- (Protnm,
- New_External_Name (Chars (Comp_Id), Suffix_Index => -1),
- 'E'));
+ Build_Selected_Name (Prottyp, Comp_Id, 'E'));
Sub :=
Make_Subprogram_Declaration (Loc,
Bdef :=
Make_Defining_Identifier (Loc,
- Build_Selected_Name
- (Protnm,
- New_External_Name (Chars (Comp_Id), Suffix_Index => -1),
- 'B'));
+ Build_Selected_Name (Prottyp, Comp_Id, 'E'));
+
Sub :=
Make_Subprogram_Declaration (Loc,
Specification =>
Set_Scope (Bdef, Scope (Comp_Id));
Current_Node := Sub;
- -- Collect pointers to the protected subprogram and the
- -- barrier of the current entry, for insertion into
- -- Entry_Bodies_Array.
+ -- Collect pointers to the protected subprogram and the barrier
+ -- of the current entry, for insertion into Entry_Bodies_Array.
Append (
Make_Aggregate (Loc,
if Abort_Allowed
or else Restriction_Active (No_Entry_Queue) = False
or else E_Count > 1
+ or else (Has_Attach_Handler (Prottyp)
+ and then not Restricted_Profile)
then
Body_Arr := Make_Object_Declaration (Loc,
Defining_Identifier => Body_Id,
Attribute_Name => Name_Unrestricted_Access))));
end if;
- -- A pointer to this array will be placed in the corresponding
- -- record by its initialization procedure, so this needs to be
- -- analyzed here.
+ -- A pointer to this array will be placed in the corresponding record
+ -- by its initialization procedure so this needs to be analyzed here.
Insert_After (Current_Node, Body_Arr);
Current_Node := Body_Arr;
if Abort_Allowed
or else Restriction_Active (No_Entry_Queue) = False
or else E_Count > 1
+ or else (Has_Attach_Handler (Prottyp)
+ and then not Restricted_Profile)
then
Sub :=
Make_Subprogram_Declaration (Loc,
--------------------------------
-- A requeue statement is expanded into one of four GNARLI operations,
- -- depending on the source and destination (task or protected object).
- -- In addition, code must be generated to jump around the remainder of
- -- processing for the original entry and, if the destination is a
- -- (different) protected object, to attempt to service it.
- -- The following illustrates the various cases:
+ -- depending on the source and destination (task or protected object). In
+ -- addition, code must be generated to jump around the remainder of
+ -- processing for the original entry and, if the destination is (different)
+ -- protected object, to attempt to service it. The following illustrates
+ -- the various cases:
-- procedure entE
-- (O : System.Address;
-- <some more of the statement sequence for entry>
- -- -- Requeue from an entry body to a task entry.
+ -- -- Requeue from an entry body to a task entry
-- Requeue_Protected_To_Task_Entry (
-- New._task_id,
-- end;
-- end entE;
- -- Requeue of a task entry call to a task entry.
+ -- Requeue of a task entry call to a task entry
-- Accept_Call (E, Ann);
-- <start of statement sequence for accept statement>
-- when all others =>
-- Exceptional_Complete_Rendezvous (Get_GNAT_Exception);
- -- Requeue of a task entry call to a protected entry.
+ -- Requeue of a task entry call to a protected entry
-- Accept_Call (E, Ann);
-- <start of statement sequence for accept statement>
Prepend (Self_Param, Params);
exit;
- -- If neither task type or protected type, must be in some
- -- inner enclosing block, so move on out
+ -- If neither task type or protected type, must be in some inner
+ -- enclosing block, so move on out
else
Oldtyp := Scope (Oldtyp);
end loop;
-- The last statement is the second label, used for completing the
- -- rendezvous the usual way.
- -- The label we are looking for is right before it.
+ -- rendezvous the usual way. The label we are looking for is right
+ -- before it.
Lab_Node :=
Prev (Last (Statements (Handled_Statement_Sequence (Acc_Stat))));
-- statements of an accept or delay alternative.
function Make_Select_Call (Select_Mode : Entity_Id) return Node_Id;
- -- Build call to Selective_Wait runtime routine.
+ -- Build call to Selective_Wait runtime routine
procedure Process_Delay_Alternative (Alt : Node_Id; Index : Int);
-- Add code to compare value of delay with previous values, and
-- During the analysis of the body of the accept statement, any
-- zero cost exception handler records were collected in the
- -- Accept_Handler_Records field of the N_Accept_Alternative
- -- node. This is where we move them to where they belong,
- -- namely the newly created procedure.
+ -- Accept_Handler_Records field of the N_Accept_Alternative node.
+ -- This is where we move them to where they belong, namely the
+ -- newly created procedure.
Set_Handler_Records (PB_Ent, Accept_Handler_Records (Alt));
Append (Proc_Body, Body_List);
else
Null_Body := New_Reference_To (Standard_True, Loc);
- -- if accept statement has declarations, insert above, given
- -- that we are not creating a body for the accept.
+ -- if accept statement has declarations, insert above, given that
+ -- we are not creating a body for the accept.
if Present (Declarations (Acc_Stm)) then
Insert_Actions (N, Declarations (Acc_Stm));
if No (Alt_Stats) then
- -- Accept with no body, followed by trailing statements.
+ -- Accept with no body, followed by trailing statements
Choices := New_List (
Make_Integer_Literal (Loc, Index));
Alt_Stats := New_List;
end if;
- -- After the call, if any, branch to to trailing statements.
- -- We create a label for each, as well as the corresponding
- -- label declaration.
+ -- After the call, if any, branch to to trailing statements. We
+ -- create a label for each, as well as the corresponding label
+ -- declaration.
Lab := Make_And_Declare_Label (Index);
Append_To (Alt_Stats,
Adjust_Condition (Condition (Alt));
- -- Determine the smallest specified delay.
+ -- Determine the smallest specified delay
+
-- for each delay alternative generate:
-- if guard-expression then
-- end if;
-- end if;
- -- The enclosing if-statement is omitted if there is no guard.
+ -- The enclosing if-statement is omitted if there is no guard
if Delay_Count = 1
or else First_Delay
Append_List (Delay_Alt, Delay_List);
- -- If the delay alternative has a statement part, add a
- -- choice to the case statements for delays.
+ -- If the delay alternative has a statement part, add choice to the
+ -- case statements for delays.
if Present (Statements (Alt)) then
if No (Condition (Alt)) then
- -- This guard will always be open.
+ -- This guard will always be open
Check_Guard := False;
end if;
Append (X, Decls);
- -- After this follow procedure declarations for each accept body.
+ -- After this follow procedure declarations for each accept body
-- procedure Pnn is
-- begin
-- and the parameter references have already been expanded to be direct
-- references to Ann (see Exp_Ch2.Expand_Entry_Parameter). Furthermore,
-- any embedded tasking statements (which would normally be illegal in
- -- procedures, have been converted to calls to the tasking runtime so
+ -- procedures), have been converted to calls to the tasking runtime so
-- there is no problem in putting them into procedures.
-- The original accept statement has been expanded into a block in
-- build them unconditionally, and not significantly inefficient,
-- since if they are short they will be inlined anyway.
- -- The procedure declarations have been assembled in Body_List.
+ -- The procedure declarations have been assembled in Body_List
-- If delays are present, we must compute the required delay.
-- We first generate the declarations:
-- Delay_Val : Some_Time_Type.Time;
-- Delay_Index will be set to the index of the minimum delay, i.e. the
- -- active delay that is actually chosen as the basis for the possible
- -- delay if an immediate rendez-vous is not possible.
- -- In the most common case there is a single delay statement, and this
- -- is handled specially.
+ -- active delay that is actually chosen as the basis for the possible
+ -- delay if an immediate rendez-vous is not possible.
+
+ -- In the most common case there is a single delay statement, and this
+ -- is handled specially.
if Delay_Count > 0 then
-- ...
-- Exit:
- -- Generate label for common exit.
+ -- Generate label for common exit
End_Lab := Make_And_Declare_Label (Num_Alts + 1);
- -- First entry is the default case, when no rendezvous is possible.
+ -- First entry is the default case, when no rendezvous is possible
Choices := New_List (New_Reference_To (RTE (RE_No_Rendezvous), Loc));
if Else_Present then
- -- If no rendezvous is possible, the else part is executed.
+ -- If no rendezvous is possible, the else part is executed
Lab := Make_And_Declare_Label (0);
Alt_Stats := New_List (
Discrete_Choices => Choices,
Statements => Alt_Stats));
- -- We make use of the fact that Accept_Index is an integer type,
- -- and generate successive literals for entries for each accept.
- -- Only those for which there is a body or trailing statements are
- -- given a case entry.
+ -- We make use of the fact that Accept_Index is an integer type, and
+ -- generate successive literals for entries for each accept. Only those
+ -- for which there is a body or trailing statements get a case entry.
Alt := First (Select_Alternatives (N));
Proc := First (Body_List);
-
while Present (Alt) loop
if Nkind (Alt) = N_Accept_Alternative then
Insert_After (Parm, New_Reference_To (M, Loc));
Insert_After (Parm, New_Reference_To (D, Loc));
- -- Create a call to RTS.
+ -- Create a call to RTS
Rewrite (Select_Call,
Make_Procedure_Call_Statement (Loc,
Name => New_Reference_To (RTE (RE_Timed_Selective_Wait), Loc),
Parameter_Associations => Parms));
- -- This new call should follow the calculation of the
- -- minimum delay.
+ -- This new call should follow the calculation of the minimum
+ -- delay.
Insert_List_Before (Select_Call, Delay_List);
--------------------------------------
-- Single task declarations should never be present after semantic
- -- analysis, since we expect them to be replaced by a declaration of
- -- an anonymous task type, followed by a declaration of the task
- -- object. We include this routine to make sure that is happening!
+ -- analysis, since we expect them to be replaced by a declaration of an
+ -- anonymous task type, followed by a declaration of the task object. We
+ -- include this routine to make sure that is happening!
procedure Expand_N_Single_Task_Declaration (N : Node_Id) is
begin
-- tnameE := True;
- -- In addition, if the task body is an activator, then a call to
- -- activate tasks is added at the start of the statements, before
- -- the call to Complete_Activation, and if in addition the task is
- -- a master then it must be established as a master. These calls are
- -- inserted and analyzed in Expand_Cleanup_Actions, when the
- -- Handled_Sequence_Of_Statements is expanded.
+ -- In addition, if the task body is an activator, then a call to activate
+ -- tasks is added at the start of the statements, before the call to
+ -- Complete_Activation, and if in addition the task is a master then it
+ -- must be established as a master. These calls are inserted and analyzed
+ -- in Expand_Cleanup_Actions, when the Handled_Sequence_Of_Statements is
+ -- expanded.
-- There is one discriminal declaration line generated for each
- -- discriminant that is present to provide an easy reference point
- -- for discriminant references inside the body (see Exp_Ch2.Expand_Name).
+ -- discriminant that is present to provide an easy reference point for
+ -- discriminant references inside the body (see Exp_Ch2.Expand_Name).
-- Note on relationship to GNARLI definition. In the GNARLI definition,
-- task body procedures have a profile (Arg : System.Address). That is
Rewrite (N, New_N);
Analyze (N);
- -- Set elaboration flag immediately after task body. If the body
- -- is a subunit, the flag is set in the declarative part that
- -- contains the stub.
+ -- Set elaboration flag immediately after task body. If the body is a
+ -- subunit, the flag is set in the declarative part containing the stub.
if Nkind (Parent (N)) /= N_Subunit then
Insert_After (N,
Make_Identifier (Loc, New_External_Name (Chars (Ttyp), 'E')),
Expression => New_Reference_To (Standard_True, Loc)));
end if;
+
+ -- Ada 2005 (AI-345): Construct the primitive entry wrapper bodies after
+ -- the task body. At this point the entry specs have been created,
+ -- frozen and included in the dispatch table for the task type.
+
+ pragma Assert (Present (Corresponding_Record_Type (Ttyp)));
+
+ if Ada_Version >= Ada_05
+ and then Present (Task_Definition (Parent (Ttyp)))
+ and then Present (Abstract_Interfaces
+ (Corresponding_Record_Type (Ttyp)))
+ then
+ declare
+ Current_Node : Node_Id;
+ Vis_Decl : Node_Id :=
+ First (Visible_Declarations (Task_Definition (Parent (Ttyp))));
+ Wrap_Body : Node_Id;
+
+ begin
+ if Nkind (Parent (N)) = N_Subunit then
+ Current_Node := Corresponding_Stub (Parent (N));
+ else
+ Current_Node := N;
+ end if;
+
+ -- Examine the visible declarations of the task type, looking for
+ -- an entry declaration. We do not consider entry families since
+ -- they cannot have dispatching operations, thus they do not need
+ -- entry wrappers.
+
+ while Present (Vis_Decl) loop
+ if Nkind (Vis_Decl) = N_Entry_Declaration
+ and then Ekind (Defining_Identifier (Vis_Decl)) = E_Entry
+ then
+
+ -- Create the specification of the wrapper
+
+ Wrap_Body :=
+ Build_Wrapper_Body (Loc,
+ Proc_Nam => Defining_Identifier (Vis_Decl),
+ Obj_Typ => Corresponding_Record_Type (Ttyp),
+ Formals => Parameter_Specifications (Vis_Decl));
+
+ if Wrap_Body /= Empty then
+ Insert_After (Current_Node, Wrap_Body);
+ Current_Node := Wrap_Body;
+
+ Analyze (Wrap_Body);
+ end if;
+ end if;
+
+ Next (Vis_Decl);
+ end loop;
+ end;
+ end if;
end Expand_N_Task_Body;
------------------------------------
-- taskE : aliased Boolean := False;
- -- Next a variable is declared to hold the task stack size (either
- -- the default : Unspecified_Size, or a value that is set by a pragma
+ -- Next a variable is declared to hold the task stack size (either the
+ -- default : Unspecified_Size, or a value that is set by a pragma
-- Storage_Size). If the value of the pragma Storage_Size is static, then
-- the variable is initialized with this value:
-- The discriminants are present only if the corresponding task type has
-- discriminants, and they exactly mirror the task type discriminants.
- -- The Id field is always present. It contains the Task_Id value, as
- -- set by the call to Create_Task. Note that although the task is
- -- limited, the task value record type is not limited, so there is no
- -- problem in passing this field as an out parameter to Create_Task.
+ -- The Id field is always present. It contains the Task_Id value, as set by
+ -- the call to Create_Task. Note that although the task is limited, the
+ -- task value record type is not limited, so there is no problem in passing
+ -- this field as an out parameter to Create_Task.
- -- One entry_family component is present for each entry family in the
- -- task definition. The bounds correspond to the bounds of the entry
- -- family (which may depend on discriminants). The element type is
- -- void, since we only need the bounds information for determining
- -- the entry index. Note that the use of an anonymous array would
- -- normally be illegal in this context, but this is a parser check,
- -- and the semantics is quite prepared to handle such a case.
-
- -- The _Size field is present only if a Storage_Size pragma appears in
- -- the task definition. The expression captures the argument that was
- -- present in the pragma, and is used to override the task stack size
- -- otherwise associated with the task type.
+ -- One entry_family component is present for each entry family in the task
+ -- definition. The bounds correspond to the bounds of the entry family
+ -- (which may depend on discriminants). The element type is void, since we
+ -- only need the bounds information for determining the entry index. Note
+ -- that the use of an anonymous array would normally be illegal in this
+ -- context, but this is a parser check, and the semantics is quite prepared
+ -- to handle such a case.
+
+ -- The _Size field is present only if a Storage_Size pragma appears in the
+ -- task definition. The expression captures the argument that was present
+ -- in the pragma, and is used to override the task stack size otherwise
+ -- associated with the task type.
-- The _Priority field is present only if a Priority or Interrupt_Priority
-- pragma appears in the task definition. The expression captures the
- -- argument that was present in the pragma, and is used to provide
- -- the Size parameter to the call to Create_Task.
+ -- argument that was present in the pragma, and is used to provide the Size
+ -- parameter to the call to Create_Task.
-- The _Task_Info field is present only if a Task_Info pragma appears in
-- the task definition. The expression captures the argument that was
-- to the call to Create_Task.
-- When a task is declared, an instance of the task value record is
- -- created. The elaboration of this declaration creates the correct
- -- bounds for the entry families, and also evaluates the size, priority,
- -- and task_Info expressions if needed. The initialization routine for
- -- the task type itself then calls Create_Task with appropriate
- -- parameters to initialize the value of the Task_Id field.
+ -- created. The elaboration of this declaration creates the correct bounds
+ -- for the entry families, and also evaluates the size, priority, and
+ -- task_Info expressions if needed. The initialization routine for the task
+ -- type itself then calls Create_Task with appropriate parameters to
+ -- initialize the value of the Task_Id field.
-- Note: the address of this record is passed as the "Discriminants"
- -- parameter for Create_Task. Since Create_Task merely passes this onto
- -- the body procedure, it does not matter that it does not quite match
- -- the GNARLI model of what is being passed (the record contains more
- -- than just the discriminants, but the discriminants can be found from
- -- the record value).
+ -- parameter for Create_Task. Since Create_Task merely passes this onto the
+ -- body procedure, it does not matter that it does not quite match the
+ -- GNARLI model of what is being passed (the record contains more than just
+ -- the discriminants, but the discriminants can be found from the record
+ -- value).
-- The Entity_Id for this created record type is placed in the
-- Corresponding_Record_Type field of the associated task type entity.
Tasknm : constant Name_Id := Chars (Tasktyp);
Taskdef : constant Node_Id := Task_Definition (N);
- Proc_Spec : Node_Id;
- Rec_Decl : Node_Id;
- Rec_Ent : Entity_Id;
- Cdecls : List_Id;
- Elab_Decl : Node_Id;
- Size_Decl : Node_Id;
- Body_Decl : Node_Id;
+ Proc_Spec : Node_Id;
+ Rec_Decl : Node_Id;
+ Rec_Ent : Entity_Id;
+ Cdecls : List_Id;
+ Elab_Decl : Node_Id;
+ Size_Decl : Node_Id;
+ Body_Decl : Node_Id;
+ Task_Size : Node_Id;
+ Ent_Stack : Entity_Id;
+ Decl_Stack : Node_Id;
begin
-- If already expanded, nothing to do
-- Here we will do the expansion
Rec_Decl := Build_Corresponding_Record (N, Tasktyp, Loc);
+
+ -- Ada 2005 (AI-345): Propagate the attribute that contains the list
+ -- of implemented interfaces.
+
+ Set_Interface_List (Type_Definition (Rec_Decl), Interface_List (N));
+
Rec_Ent := Defining_Identifier (Rec_Decl);
Cdecls := Component_Items (Component_List
(Type_Definition (Rec_Decl)));
Insert_After (Elab_Decl, Size_Decl);
- -- Next build the rest of the corresponding record declaration.
- -- This is done last, since the corresponding record initialization
- -- procedure will reference the previously created entities.
+ -- Next build the rest of the corresponding record declaration. This is
+ -- done last, since the corresponding record initialization procedure
+ -- will reference the previously created entities.
- -- Fill in the component declarations. First the _Task_Id field.
+ -- Fill in the component declarations -- first the _Task_Id field
Append_To (Cdecls,
Make_Component_Declaration (Loc,
Component_Definition =>
Make_Component_Definition (Loc,
Aliased_Present => False,
- Subtype_Indication => New_Reference_To (RTE (RO_ST_Task_ID),
+ Subtype_Indication => New_Reference_To (RTE (RO_ST_Task_Id),
Loc))));
+ -- Declare static ATCB (that is, created by the expander) if we are
+ -- using the Restricted run time.
+
+ if Restricted_Profile then
+ Append_To (Cdecls,
+ Make_Component_Declaration (Loc,
+ Defining_Identifier =>
+ Make_Defining_Identifier (Loc, Name_uATCB),
+
+ Component_Definition =>
+ Make_Component_Definition (Loc,
+ Aliased_Present => True,
+ Subtype_Indication => Make_Subtype_Indication (Loc,
+ Subtype_Mark => New_Occurrence_Of
+ (RTE (RE_Ada_Task_Control_Block), Loc),
+
+ Constraint =>
+ Make_Index_Or_Discriminant_Constraint (Loc,
+ Constraints =>
+ New_List (Make_Integer_Literal (Loc, 0)))))));
+
+ end if;
+
+ -- Declare static stack (that is, created by the expander) if we are
+ -- using the Restricted run time on a bare board configuration.
+
+ if Restricted_Profile
+ and then Preallocated_Stacks_On_Target
+ then
+ -- First we need to extract the appropriate stack size
+
+ Ent_Stack := Make_Defining_Identifier (Loc, Name_uStack);
+
+ if Present (Taskdef) and then Has_Storage_Size_Pragma (Taskdef) then
+ declare
+ Expr_N : constant Node_Id :=
+ Expression (First (
+ Pragma_Argument_Associations (
+ Find_Task_Or_Protected_Pragma
+ (Taskdef, Name_Storage_Size))));
+ Etyp : constant Entity_Id := Etype (Expr_N);
+ P : constant Node_Id := Parent (Expr_N);
+
+ begin
+ -- The stack is defined inside the corresponding record.
+ -- Therefore if the size of the stack is set by means of
+ -- a discriminant, we must reference the discriminant of the
+ -- corresponding record type.
+
+ if Nkind (Expr_N) in N_Has_Entity
+ and then Present (Discriminal_Link (Entity (Expr_N)))
+ then
+ Task_Size :=
+ New_Reference_To
+ (CR_Discriminant (Discriminal_Link (Entity (Expr_N))),
+ Loc);
+ Set_Parent (Task_Size, P);
+ Set_Etype (Task_Size, Etyp);
+ Set_Analyzed (Task_Size);
+
+ else
+ Task_Size := Relocate_Node (Expr_N);
+ end if;
+ end;
+
+ else
+ Task_Size :=
+ New_Reference_To (RTE (RE_Default_Stack_Size), Loc);
+ end if;
+
+ Decl_Stack := Make_Component_Declaration (Loc,
+ Defining_Identifier => Ent_Stack,
+
+ Component_Definition =>
+ Make_Component_Definition (Loc,
+ Aliased_Present => True,
+ Subtype_Indication => 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 => Convert_To (RTE (RE_Storage_Offset),
+ Task_Size)))))));
+
+ Append_To (Cdecls, Decl_Stack);
+
+ -- The appropriate alignment for the stack is ensured by the run-time
+ -- code in charge of task creation.
+
+ end if;
+
-- Add components for entry families
Collect_Entry_Families (Loc, Cdecls, Size_Decl, Tasktyp);
Insert_After (Rec_Decl, Body_Decl);
- -- The subprogram does not comes from source, so we have to indicate
- -- the need for debugging information explicitly.
+ -- The subprogram does not comes from source, so we have to indicate the
+ -- need for debugging information explicitly.
Set_Needs_Debug_Info
(Defining_Entity (Proc_Spec), Comes_From_Source (Original_Node (N)));
- -- Now we can freeze the corresponding record. This needs manually
- -- freezing, since it is really part of the task type, and the task
- -- type is frozen at this stage. We of course need the initialization
- -- procedure for this corresponding record type and we won't get it
- -- in time if we don't freeze now.
+ -- Ada 2005 (AI-345): Construct the primitive entry wrapper specs before
+ -- the corresponding record has been frozen.
- declare
- L : constant List_Id := Freeze_Entity (Rec_Ent, Loc);
+ if Ada_Version >= Ada_05
+ and then Present (Taskdef)
+ and then Present (Corresponding_Record_Type
+ (Defining_Identifier (Parent (Taskdef))))
+ and then Present (Abstract_Interfaces
+ (Corresponding_Record_Type
+ (Defining_Identifier (Parent (Taskdef)))))
+ then
+ declare
+ Current_Node : Node_Id := Rec_Decl;
+ Vis_Decl : Node_Id := First (Visible_Declarations (Taskdef));
+ Wrap_Spec : Node_Id;
+ New_N : Node_Id;
- begin
- if Is_Non_Empty_List (L) then
- Insert_List_After (Body_Decl, L);
- end if;
- end;
+ begin
+ -- Examine the visible declarations of the task type, looking for
+ -- an entry declaration. We do not consider entry families since
+ -- they cannot have dispatching operations, thus they do not need
+ -- entry wrappers.
+
+ while Present (Vis_Decl) loop
+ if Nkind (Vis_Decl) = N_Entry_Declaration
+ and then Ekind (Defining_Identifier (Vis_Decl)) = E_Entry
+ then
+ Wrap_Spec :=
+ Build_Wrapper_Spec (Loc,
+ Proc_Nam => Defining_Identifier (Vis_Decl),
+ Obj_Typ => Etype (Rec_Ent),
+ Formals => Parameter_Specifications (Vis_Decl));
+
+ if Wrap_Spec /= Empty then
+ New_N :=
+ Make_Subprogram_Declaration (Loc,
+ Specification => Wrap_Spec);
+
+ Insert_After (Current_Node, New_N);
+ Current_Node := New_N;
+
+ Analyze (New_N);
+ end if;
+ end if;
+
+ Next (Vis_Decl);
+ end loop;
+ end;
+ end if;
- -- Complete the expansion of access types to the current task
- -- type, if any were declared.
+ -- Ada 2005 (AI-345): We must defer freezing to allow further
+ -- declaration of primitive subprograms covering task interfaces
+
+ if Ada_Version <= Ada_95 then
+
+ -- Now we can freeze the corresponding record. This needs manually
+ -- freezing, since it is really part of the task type, and the task
+ -- type is frozen at this stage. We of course need the initialization
+ -- procedure for this corresponding record type and we won't get it
+ -- in time if we don't freeze now.
+
+ declare
+ L : constant List_Id := Freeze_Entity (Rec_Ent, Loc);
+
+ begin
+ if Is_Non_Empty_List (L) then
+ Insert_List_After (Body_Decl, L);
+ end if;
+ end;
+ end if;
+
+ -- Complete the expansion of access types to the current task type, if
+ -- any were declared.
Expand_Previous_Access_Type (Tasktyp);
end Expand_N_Task_Type_Declaration;
-- Expand_N_Timed_Entry_Call --
-------------------------------
- -- A timed entry call in normal case is not implemented using ATC
- -- mechanism anymore for efficiency reason.
+ -- A timed entry call in normal case is not implemented using ATC mechanism
+ -- anymore for efficiency reason.
-- select
-- T.E;
-- 1) When T.E is a task entry_call;
-- declare
- -- B : Boolean;
- -- X : Task_Entry_Index := <entry index>;
+ -- B : Boolean;
+ -- X : Task_Entry_Index := <entry index>;
-- DX : Duration := To_Duration (D);
- -- M : Delay_Mode := <discriminant>;
- -- P : parms := (parm, parm, parm);
+ -- M : Delay_Mode := <discriminant>;
+ -- P : parms := (parm, parm, parm);
-- begin
-- Timed_Protected_Entry_Call (<acceptor-task>, X, P'Address,
-- B : Boolean;
-- X : Protected_Entry_Index := <entry index>;
-- DX : Duration := To_Duration (D);
- -- M : Delay_Mode := <discriminant>;
+ -- M : Delay_Mode := <discriminant>;
-- P : parms := (parm, parm, parm);
-- begin
-- end if;
-- end;
+ -- 3) Ada 2005 (AI-345): When T.E is a dispatching procedure call;
+
+ -- declare
+ -- B : Boolean := False;
+ -- C : Ada.Tags.Prim_Op_Kind;
+ -- DX : Duration := To_Duration (D)
+ -- K : Ada.Tags.Tagged_Kind :=
+ -- Ada.Tags.Get_Tagged_Kind (Ada.Tags.Tag (<object>));
+ -- M : Integer :=...;
+ -- P : Parameters := (Param1 .. ParamN);
+ -- S : Iteger;
+
+ -- begin
+ -- if K = Ada.Tags.TK_Limited_Tagged then
+ -- <dispatching-call>;
+ -- <triggering-statements>
+
+ -- else
+ -- S := Ada.Tags.Get_Offset_Index (Ada.Tags.Tag (<object>),
+ -- DT_Position (<dispatching-call>));
+
+ -- _Disp_Timed_Select (<object>, S, P'Address, DX, M, C, B);
+
+ -- if C = POK_Protected_Entry
+ -- or else C = POK_Task_Entry
+ -- then
+ -- Param1 := P.Param1;
+ -- ...
+ -- ParamN := P.ParamN;
+ -- end if;
+
+ -- if B then
+ -- if C = POK_Procedure
+ -- or else C = POK_Protected_Procedure
+ -- or else C = POK_Task_Procedure
+ -- then
+ -- <dispatching-call>;
+ -- end if;
+
+ -- <triggering-statements>
+ -- else
+ -- <timed-statements>
+ -- end if;
+ -- end if;
+ -- end;
+
procedure Expand_N_Timed_Entry_Call (N : Node_Id) is
Loc : constant Source_Ptr := Sloc (N);
D_Stats : constant List_Id :=
Statements (Delay_Alternative (N));
- Stmts : List_Id;
- Stmt : Node_Id;
- Parms : List_Id;
- Parm : Node_Id;
-
- Concval : Node_Id;
- Ename : Node_Id;
- Index : Node_Id;
-
- Decls : List_Id;
- Disc : Node_Id;
- Conv : Node_Id;
- B : Entity_Id;
- D : Entity_Id;
- Dtyp : Entity_Id;
- M : Entity_Id;
-
- Call : Node_Id;
- Dummy : Node_Id;
+ Actuals : List_Id;
+ Blk_Typ : Entity_Id;
+ Call : Node_Id;
+ Call_Ent : Entity_Id;
+ Conc_Typ_Stmts : List_Id;
+ Concval : Node_Id;
+ D_Conv : Node_Id;
+ D_Disc : Node_Id;
+ D_Type : Entity_Id;
+ Decls : List_Id;
+ Dummy : Node_Id;
+ Ename : Node_Id;
+ Formals : List_Id;
+ Index : Node_Id;
+ Lim_Typ_Stmts : List_Id;
+ N_Stats : List_Id;
+ Obj : Entity_Id;
+ Param : Node_Id;
+ Params : List_Id;
+ Stmt : Node_Id;
+ Stmts : List_Id;
+ Unpack : List_Id;
+
+ B : Entity_Id; -- Call status flag
+ C : Entity_Id; -- Call kind
+ D : Entity_Id; -- Delay
+ K : Entity_Id; -- Tagged kind
+ M : Entity_Id; -- Delay mode
+ P : Entity_Id; -- Parameter block
+ S : Entity_Id; -- Primitive operation slot
begin
-- The arguments in the call may require dynamic allocation, and the
if Nkind (E_Call) = N_Block_Statement then
E_Call := First (Statements (Handled_Statement_Sequence (E_Call)));
-
while Nkind (E_Call) /= N_Procedure_Call_Statement
and then Nkind (E_Call) /= N_Entry_Call_Statement
loop
end loop;
end if;
- -- Build an entry call using Simple_Entry_Call. We will use this as the
- -- base for creating appropriate calls.
+ if Ada_Version >= Ada_05
+ and then Nkind (E_Call) = N_Procedure_Call_Statement
+ then
+ Extract_Dispatching_Call (E_Call, Call_Ent, Obj, Actuals, Formals);
+
+ Decls := New_List;
+ Stmts := New_List;
+
+ else
+ -- Build an entry call using Simple_Entry_Call
- Extract_Entry (E_Call, Concval, Ename, Index);
- Build_Simple_Entry_Call (E_Call, Concval, Ename, Index);
+ Extract_Entry (E_Call, Concval, Ename, Index);
+ Build_Simple_Entry_Call (E_Call, Concval, Ename, Index);
- Stmts := Statements (Handled_Statement_Sequence (E_Call));
- Decls := Declarations (E_Call);
+ Decls := Declarations (E_Call);
+ Stmts := Statements (Handled_Statement_Sequence (E_Call));
- if No (Decls) then
- Decls := New_List;
+ if No (Decls) then
+ Decls := New_List;
+ end if;
+ end if;
+
+ -- Call status flag processing
+
+ if Ada_Version >= Ada_05
+ and then Nkind (E_Call) = N_Procedure_Call_Statement
+ then
+ -- Generate:
+ -- B : Boolean := False;
+
+ B := Build_B (Loc, Decls);
+
+ else
+ -- Generate:
+ -- B : Boolean;
+
+ B := Make_Defining_Identifier (Loc, Name_uB);
+
+ Prepend_To (Decls,
+ Make_Object_Declaration (Loc,
+ Defining_Identifier =>
+ B,
+ Object_Definition =>
+ New_Reference_To (Standard_Boolean, Loc)));
+ end if;
+
+ -- Call kind processing
+
+ if Ada_Version >= Ada_05
+ and then Nkind (E_Call) = N_Procedure_Call_Statement
+ then
+ -- Generate:
+ -- C : Ada.Tags.Prim_Op_Kind;
+
+ C := Build_C (Loc, Decls);
end if;
- Dtyp := Base_Type (Etype (Expression (D_Stat)));
+ -- Duration and mode processing
+
+ D_Type := Base_Type (Etype (Expression (D_Stat)));
-- Use the type of the delay expression (Calendar or Real_Time)
-- to generate the appropriate conversion.
if Nkind (D_Stat) = N_Delay_Relative_Statement then
- Disc := Make_Integer_Literal (Loc, 0);
- Conv := Relocate_Node (Expression (D_Stat));
+ D_Disc := Make_Integer_Literal (Loc, 0);
+ D_Conv := Relocate_Node (Expression (D_Stat));
- elsif Is_RTE (Dtyp, RO_CA_Time) then
- Disc := Make_Integer_Literal (Loc, 1);
- Conv := Make_Function_Call (Loc,
+ elsif Is_RTE (D_Type, RO_CA_Time) then
+ D_Disc := Make_Integer_Literal (Loc, 1);
+ D_Conv := Make_Function_Call (Loc,
New_Reference_To (RTE (RO_CA_To_Duration), Loc),
New_List (New_Copy (Expression (D_Stat))));
- else pragma Assert (Is_RTE (Dtyp, RO_RT_Time));
- Disc := Make_Integer_Literal (Loc, 2);
- Conv := Make_Function_Call (Loc,
+ else pragma Assert (Is_RTE (D_Type, RO_RT_Time));
+ D_Disc := Make_Integer_Literal (Loc, 2);
+ D_Conv := Make_Function_Call (Loc,
New_Reference_To (RTE (RO_RT_To_Duration), Loc),
New_List (New_Copy (Expression (D_Stat))));
end if;
- -- Create Duration and Delay_Mode objects for passing a delay value
+ D := Make_Defining_Identifier (Loc, New_Internal_Name ('D'));
+
+ -- Generate:
+ -- D : Duration;
+
+ Append_To (Decls,
+ Make_Object_Declaration (Loc,
+ Defining_Identifier =>
+ D,
+ Object_Definition =>
+ New_Reference_To (Standard_Duration, Loc)));
+
+ M := Make_Defining_Identifier (Loc, New_Internal_Name ('M'));
+
+ -- Generate:
+ -- M : Integer := (0 | 1 | 2);
+
+ Append_To (Decls,
+ Make_Object_Declaration (Loc,
+ Defining_Identifier =>
+ M,
+ Object_Definition =>
+ New_Reference_To (Standard_Integer, Loc),
+ Expression =>
+ D_Disc));
+
+ -- Do the assignement at this stage only because the evaluation of the
+ -- expression must not occur before (see ACVC C97302A).
+
+ Append_To (Stmts,
+ Make_Assignment_Statement (Loc,
+ Name =>
+ New_Reference_To (D, Loc),
+ Expression =>
+ D_Conv));
+
+ -- Parameter block processing
+
+ -- Manually create the parameter block for dispatching calls. In the
+ -- case of entries, the block has already been created during the call
+ -- to Build_Simple_Entry_Call.
+
+ if Ada_Version >= Ada_05
+ and then Nkind (E_Call) = N_Procedure_Call_Statement
+ then
+ -- Tagged kind processing, generate:
+ -- K : Ada.Tags.Tagged_Kind :=
+ -- Ada.Tags.Get_Tagged_Kind (Ada.Tags.Tag <object>));
+
+ K := Build_K (Loc, Decls, Obj);
+
+ Blk_Typ := Build_Parameter_Block (Loc, Actuals, Formals, Decls);
+ P := Parameter_Block_Pack (Loc, Blk_Typ, Actuals, Formals,
+ Decls, Stmts);
+
+ -- Dispatch table slot processing, generate:
+ -- S : Integer;
+
+ S := Build_S (Loc, Decls);
+
+ -- Generate:
+ -- S := Ada.Tags.Get_Offset_Index (
+ -- Ada.Tags.Tag (<object>), DT_Position (Call_Ent));
+
+ Conc_Typ_Stmts := New_List (
+ Build_S_Assignment (Loc, S, Obj, Call_Ent));
+
+ -- Generate:
+ -- _Disp_Timed_Select (<object>, S, P'address, D, M, C, B);
+
+ -- where Obj is the controlling formal parameter, S is the dispatch
+ -- table slot number of the dispatching operation, P is the wrapped
+ -- parameter block, D is the duration, M is the duration mode, C is
+ -- the call kind and B is the call status.
+
+ Params := New_List;
+
+ Append_To (Params, New_Copy_Tree (Obj));
+ Append_To (Params, New_Reference_To (S, Loc));
+ Append_To (Params, Make_Attribute_Reference (Loc,
+ Prefix => New_Reference_To (P, Loc),
+ Attribute_Name => Name_Address));
+ Append_To (Params, New_Reference_To (D, Loc));
+ Append_To (Params, New_Reference_To (M, Loc));
+ Append_To (Params, New_Reference_To (C, Loc));
+ Append_To (Params, New_Reference_To (B, Loc));
+
+ Append_To (Conc_Typ_Stmts,
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (
+ Find_Prim_Op (Etype (Etype (Obj)),
+ Name_uDisp_Timed_Select),
+ Loc),
+ Parameter_Associations =>
+ Params));
+
+ -- Generate:
+ -- if C = POK_Protected_Entry
+ -- or else C = POK_Task_Entry
+ -- then
+ -- Param1 := P.Param1;
+ -- ...
+ -- ParamN := P.ParamN;
+ -- end if;
+
+ Unpack := Parameter_Block_Unpack (Loc, P, Actuals, Formals);
+
+ -- Generate the if statement only when the packed parameters need
+ -- explicit assignments to their corresponding actuals.
+
+ if Present (Unpack) then
+ Append_To (Conc_Typ_Stmts,
+ Make_If_Statement (Loc,
+
+ Condition =>
+ Make_Or_Else (Loc,
+ Left_Opnd =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (
+ RE_POK_Protected_Entry), Loc)),
+ Right_Opnd =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (RE_POK_Task_Entry), Loc))),
+
+ Then_Statements =>
+ Unpack));
+ end if;
+
+ -- Generate:
+
+ -- if B then
+ -- if C = POK_Procedure
+ -- or else C = POK_Protected_Procedure
+ -- or else C = POK_Task_Procedure
+ -- then
+ -- <dispatching-call>
+ -- end if;
+ -- <triggering-statements>
+ -- else
+ -- <timed-statements>
+ -- end if;
+
+ N_Stats := New_Copy_List_Tree (E_Stats);
+
+ Prepend_To (N_Stats,
+ Make_If_Statement (Loc,
+
+ Condition =>
+ Make_Or_Else (Loc,
+ Left_Opnd =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (RE_POK_Procedure), Loc)),
+ Right_Opnd =>
+ Make_Or_Else (Loc,
+ Left_Opnd =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (
+ RE_POK_Protected_Procedure), Loc)),
+ Right_Opnd =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (C, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (
+ RE_POK_Task_Procedure), Loc)))),
+
+ Then_Statements =>
+ New_List (E_Call)));
- D := Make_Defining_Identifier (Loc, New_Internal_Name ('D'));
- M := Make_Defining_Identifier (Loc, New_Internal_Name ('M'));
+ Append_To (Conc_Typ_Stmts,
+ Make_If_Statement (Loc,
+ Condition => New_Reference_To (B, Loc),
+ Then_Statements => N_Stats,
+ Else_Statements => D_Stats));
- Append_To (Decls,
- Make_Object_Declaration (Loc,
- Defining_Identifier => D,
- Object_Definition => New_Reference_To (Standard_Duration, Loc)));
+ -- Generate:
+ -- <dispatching-call>;
+ -- <triggering-statements>
- Append_To (Decls,
- Make_Object_Declaration (Loc,
- Defining_Identifier => M,
- Object_Definition => New_Reference_To (Standard_Integer, Loc),
- Expression => Disc));
+ Lim_Typ_Stmts := New_Copy_List_Tree (E_Stats);
+ Prepend_To (Lim_Typ_Stmts, New_Copy_Tree (E_Call));
- B := Make_Defining_Identifier (Loc, Name_uB);
+ -- Generate:
+ -- if K = Ada.Tags.TK_Limited_Tagged then
+ -- Lim_Typ_Stmts
+ -- else
+ -- Conc_Typ_Stmts
+ -- end if;
- -- Create a boolean object used for a return parameter.
+ Append_To (Stmts,
+ Make_If_Statement (Loc,
+ Condition =>
+ Make_Op_Eq (Loc,
+ Left_Opnd =>
+ New_Reference_To (K, Loc),
+ Right_Opnd =>
+ New_Reference_To (RTE (RE_TK_Limited_Tagged), Loc)),
- Prepend_To (Decls,
- Make_Object_Declaration (Loc,
- Defining_Identifier => B,
- Object_Definition => New_Reference_To (Standard_Boolean, Loc)));
+ Then_Statements =>
+ Lim_Typ_Stmts,
- Stmt := First (Stmts);
+ Else_Statements =>
+ Conc_Typ_Stmts));
- -- Skip assignments to temporaries created for in-out parameters.
- -- This makes unwarranted assumptions about the shape of the expanded
- -- tree for the call, and should be cleaned up ???
+ else
+ -- Skip assignments to temporaries created for in-out parameters.
+ -- This makes unwarranted assumptions about the shape of the expanded
+ -- tree for the call, and should be cleaned up ???
- while Nkind (Stmt) /= N_Procedure_Call_Statement loop
- Next (Stmt);
- end loop;
+ Stmt := First (Stmts);
+ while Nkind (Stmt) /= N_Procedure_Call_Statement loop
+ Next (Stmt);
+ end loop;
- -- Do the assignement at this stage only because the evaluation of the
- -- expression must not occur before (see ACVC C97302A).
+ -- Do the assignement at this stage only because the evaluation
+ -- of the expression must not occur before (see ACVC C97302A).
- Insert_Before (Stmt,
- Make_Assignment_Statement (Loc,
- Name => New_Reference_To (D, Loc),
- Expression => Conv));
+ Insert_Before (Stmt,
+ Make_Assignment_Statement (Loc,
+ Name => New_Reference_To (D, Loc),
+ Expression => D_Conv));
- Call := Stmt;
+ Call := Stmt;
+ Params := Parameter_Associations (Call);
- Parms := Parameter_Associations (Call);
+ -- For a protected type, we build a Timed_Protected_Entry_Call
- -- For a protected type, we build a Timed_Protected_Entry_Call
+ if Is_Protected_Type (Etype (Concval)) then
- if Is_Protected_Type (Etype (Concval)) then
+ -- Create a new call statement
- -- Create a new call statement
+ Param := First (Params);
+ while Present (Param)
+ and then not Is_RTE (Etype (Param), RE_Call_Modes)
+ loop
+ Next (Param);
+ end loop;
- Parm := First (Parms);
+ Dummy := Remove_Next (Next (Param));
- while Present (Parm)
- and then not Is_RTE (Etype (Parm), RE_Call_Modes)
- loop
- Next (Parm);
- end loop;
+ -- Remove garbage is following the Cancel_Param if present
- Dummy := Remove_Next (Next (Parm));
+ Dummy := Next (Param);
- -- In case some garbage is following the Cancel_Param, remove.
+ -- Remove the mode of the Protected_Entry_Call call, then remove
+ -- the Communication_Block of the Protected_Entry_Call call, and
+ -- finally add Duration and a Delay_Mode parameter
- Dummy := Next (Parm);
+ pragma Assert (Present (Param));
+ Rewrite (Param, New_Reference_To (D, Loc));
- -- Remove the mode of the Protected_Entry_Call call, the
- -- Communication_Block of the Protected_Entry_Call call, and add a
- -- Duration and a Delay_Mode parameter
+ Rewrite (Dummy, New_Reference_To (M, Loc));
- pragma Assert (Present (Parm));
- Rewrite (Parm, New_Reference_To (D, Loc));
+ -- Add a Boolean flag for successful entry call
- Rewrite (Dummy, New_Reference_To (M, Loc));
+ Append_To (Params, New_Reference_To (B, Loc));
- -- Add a Boolean flag for successful entry call.
+ if Abort_Allowed
+ or else Restriction_Active (No_Entry_Queue) = False
+ or else Number_Entries (Etype (Concval)) > 1
+ then
+ Rewrite (Call,
+ Make_Procedure_Call_Statement (Loc,
+ Name =>
+ New_Reference_To (RTE (
+ RE_Timed_Protected_Entry_Call), Loc),
+ Parameter_Associations => Params));
+ else
+ Param := First (Params);
+ while Present (Param)
+ and then not Is_RTE (Etype (Param), RE_Protected_Entry_Index)
+ loop
+ Next (Param);
+ end loop;
- Append_To (Parms, New_Reference_To (B, Loc));
+ Remove (Param);
- if Abort_Allowed
- or else Restriction_Active (No_Entry_Queue) = False
- or else Number_Entries (Etype (Concval)) > 1
- then
- Rewrite (Call,
- Make_Procedure_Call_Statement (Loc,
- Name =>
- New_Reference_To (RTE (RE_Timed_Protected_Entry_Call), Loc),
- Parameter_Associations => Parms));
+ Rewrite (Call,
+ Make_Procedure_Call_Statement (Loc,
+ Name => New_Reference_To (
+ RTE (RE_Timed_Protected_Single_Entry_Call), Loc),
+ Parameter_Associations => Params));
+ end if;
- else
- Parm := First (Parms);
+ -- For the task case, build a Timed_Task_Entry_Call
- while Present (Parm)
- and then not Is_RTE (Etype (Parm), RE_Protected_Entry_Index)
- loop
- Next (Parm);
- end loop;
+ else
+ -- Create a new call statement
- Remove (Parm);
+ Append_To (Params, New_Reference_To (D, Loc));
+ Append_To (Params, New_Reference_To (M, Loc));
+ Append_To (Params, New_Reference_To (B, Loc));
Rewrite (Call,
Make_Procedure_Call_Statement (Loc,
- Name => New_Reference_To (
- RTE (RE_Timed_Protected_Single_Entry_Call), Loc),
- Parameter_Associations => Parms));
+ Name =>
+ New_Reference_To (RTE (RE_Timed_Task_Entry_Call), Loc),
+ Parameter_Associations => Params));
end if;
- -- For the task case, build a Timed_Task_Entry_Call
-
- else
- -- Create a new call statement
-
- Append_To (Parms, New_Reference_To (D, Loc));
- Append_To (Parms, New_Reference_To (M, Loc));
- Append_To (Parms, New_Reference_To (B, Loc));
-
- Rewrite (Call,
- Make_Procedure_Call_Statement (Loc,
- Name => New_Reference_To (RTE (RE_Timed_Task_Entry_Call), Loc),
- Parameter_Associations => Parms));
-
+ Append_To (Stmts,
+ Make_Implicit_If_Statement (N,
+ Condition => New_Reference_To (B, Loc),
+ Then_Statements => E_Stats,
+ Else_Statements => D_Stats));
end if;
- Append_To (Stmts,
- Make_Implicit_If_Statement (N,
- Condition => New_Reference_To (B, Loc),
- Then_Statements => E_Stats,
- Else_Statements => D_Stats));
-
Rewrite (N,
Make_Block_Statement (Loc,
Declarations => Decls,
-- Expand_Protected_Body_Declarations --
----------------------------------------
- -- Part of the expansion of a protected body involves the creation of
- -- a declaration that can be referenced from the statement sequences of
- -- the entry bodies:
+ -- Part of the expansion of a protected body involves the creation of a
+ -- declaration that can be referenced from the statement sequences of the
+ -- entry bodies:
-- A : Address;
- -- This declaration is inserted in the declarations of the service
- -- entries procedure for the protected body, and it is important that
- -- it be inserted before the statements of the entry body statement
- -- sequences are analyzed. Thus it would be too late to create this
- -- declaration in the Expand_N_Protected_Body routine, which is why
- -- there is a separate procedure to be called directly from Sem_Ch9.
+ -- This declaration is inserted in the declarations of the service entries
+ -- procedure for the protected body, and it is important that it be
+ -- inserted before the statements of the entry body statement sequences are
+ -- analyzed. Thus it would be too late to create this declaration in the
+ -- Expand_N_Protected_Body routine, which is why there is a separate
+ -- procedure to be called directly from Sem_Ch9.
-- Ann is used to hold the address of the record containing the parameters
-- (see Expand_N_Entry_Call for more details on how this record is built).
-- Accept_Address stack in the corresponding entry entity, and this element
-- must be set in place before the statements are processed.
- -- No stack is needed for entry bodies, since they cannot be nested, but
- -- it is kept for consistency between protected and task entries. The
- -- stack will never contain more than one element. There is also only one
- -- such variable for a given protected body, but this is placed on the
+ -- No stack is needed for entry bodies, since they cannot be nested, but it
+ -- is kept for consistency between protected and task entries. The stack
+ -- will never contain more than one element. There is also only one such
+ -- variable for a given protected body, but this is placed on the
-- Accept_Address stack of all of the entries, again for consistency.
- -- To expand the requeue statement, a label is provided at the end of
- -- the loop in the entry service routine created by the expander (see
+ -- To expand the requeue statement, a label is provided at the end of the
+ -- loop in the entry service routine created by the expander (see
-- Expand_N_Protected_Body for details), so that the statement can be
-- skipped after the requeue is complete. This label is created during the
-- expansion of the entry body, which will take place after the expansion
elsif Expander_Active then
- -- Associate privals with the first subprogram or entry
- -- body to be expanded. These are used to expand references
- -- to private data objects.
+ -- Associate privals with the first subprogram or entry body to be
+ -- expanded. These are used to expand references to private data
+ -- objects.
Op := First_Protected_Operation (Declarations (N));
function External_Subprogram (E : Entity_Id) return Entity_Id is
Subp : constant Entity_Id := Protected_Body_Subprogram (E);
- Decl : constant Node_Id := Unit_Declaration_Node (E);
begin
- -- If the protected operation is defined in the visible part of the
- -- protected type, or if it is an interrupt handler, the internal and
- -- external subprograms follow each other on the entity chain. If the
- -- operation is defined in the private part of the type, there is no
- -- need for a separate locking version of the operation, and internal
- -- calls use the protected_body_subprogram directly.
-
- if List_Containing (Decl) = Visible_Declarations (Parent (Decl))
- or else Is_Interrupt_Handler (E)
- then
- return Next_Entity (Subp);
+ -- The internal and external subprograms follow each other on the entity
+ -- chain. Note that previously private operations had no separate
+ -- external subprogram. We now create one in all cases, because a
+ -- private operation may actually appear in an external call, through
+ -- a 'Access reference used for a callback.
+
+ -- If the operation is a function that returns an anonymous access type,
+ -- the corresponding itype appears before the operation, and must be
+ -- skipped.
+
+ -- This mechanism is fragile, there should be a real link between the
+ -- two versions of the operation, but there is no place to put it ???
+
+ if Is_Access_Type (Next_Entity (Subp)) then
+ return Next_Entity (Next_Entity (Subp));
else
- return (Subp);
+ return Next_Entity (Subp);
end if;
end External_Subprogram;
+ ------------------------------
+ -- Extract_Dispatching_Call --
+ ------------------------------
+
+ procedure Extract_Dispatching_Call
+ (N : Node_Id;
+ Call_Ent : out Entity_Id;
+ Object : out Entity_Id;
+ Actuals : out List_Id;
+ Formals : out List_Id)
+ is
+ Call_Nam : Node_Id;
+
+ begin
+ pragma Assert (Nkind (N) = N_Procedure_Call_Statement);
+
+ if Present (Original_Node (N)) then
+ Call_Nam := Name (Original_Node (N));
+ else
+ Call_Nam := Name (N);
+ end if;
+
+ -- Retrieve the name of the dispatching procedure. It contains the
+ -- dispatch table slot number.
+
+ loop
+ case Nkind (Call_Nam) is
+ when N_Identifier =>
+ exit;
+
+ when N_Selected_Component =>
+ Call_Nam := Selector_Name (Call_Nam);
+
+ when others =>
+ raise Program_Error;
+
+ end case;
+ end loop;
+
+ Actuals := Parameter_Associations (N);
+ Call_Ent := Entity (Call_Nam);
+ Formals := Parameter_Specifications (Parent (Call_Ent));
+ Object := First (Actuals);
+
+ if Present (Original_Node (Object)) then
+ Object := Original_Node (Object);
+ end if;
+ end Extract_Dispatching_Call;
+
-------------------
-- Extract_Entry --
-------------------
Ename := Selector_Name (Nam);
Index := Empty;
- -- For a member of an entry family, the name is an indexed
- -- component where the prefix is a selected component,
- -- whose prefix in turn is the task value, and whose
- -- selector is the entry family. The single expression in
- -- the expressions list of the indexed component is the
- -- subscript for the family.
+ -- For a member of an entry family, the name is an indexed component
+ -- where the prefix is a selected component, whose prefix in turn is
+ -- the task value, and whose selector is the entry family. The single
+ -- expression in the expressions list of the indexed component is the
+ -- subscript for the family.
- else
- pragma Assert (Nkind (Nam) = N_Indexed_Component);
+ else pragma Assert (Nkind (Nam) = N_Indexed_Component);
Concval := Prefix (Prefix (Nam));
Ename := Selector_Name (Prefix (Nam));
Index := First (Expressions (Nam));
(Loc : Source_Ptr;
Hi : Node_Id;
Lo : Node_Id;
- Ttyp : Entity_Id) return Node_Id
+ Ttyp : Entity_Id;
+ Cap : Boolean) return Node_Id
is
+ Ityp : Entity_Id;
+ Real_Hi : Node_Id;
+ Real_Lo : Node_Id;
+
function Convert_Discriminant_Ref (Bound : Node_Id) return Node_Id;
- -- If one of the bounds is a reference to a discriminant, replace
- -- with corresponding discriminal of type. Within the body of a task
- -- retrieve the renamed discriminant by simple visibility, using its
- -- generated name. Within a protected object, find the original dis-
- -- criminant and replace it with the discriminal of the current prot-
- -- ected operation.
+ -- If one of the bounds is a reference to a discriminant, replace with
+ -- corresponding discriminal of type. Within the body of a task retrieve
+ -- the renamed discriminant by simple visibility, using its generated
+ -- name. Within a protected object, find the original discriminant and
+ -- replace it with the discriminal of the current protected operation.
------------------------------
-- Convert_Discriminant_Ref --
elsif Is_Protected_Type (Ttyp) then
D := First_Discriminant (Ttyp);
-
while Chars (D) /= Chars (Entity (Bound)) loop
Next_Discriminant (D);
end loop;
-- Start of processing for Family_Offset
begin
- return
- Make_Op_Subtract (Loc,
- Left_Opnd => Convert_Discriminant_Ref (Hi),
- Right_Opnd => Convert_Discriminant_Ref (Lo));
+ Real_Hi := Convert_Discriminant_Ref (Hi);
+ Real_Lo := Convert_Discriminant_Ref (Lo);
+
+ if Cap then
+ if Is_Task_Type (Ttyp) then
+ Ityp := RTE (RE_Task_Entry_Index);
+ else
+ Ityp := RTE (RE_Protected_Entry_Index);
+ end if;
+
+ Real_Hi :=
+ Make_Attribute_Reference (Loc,
+ Prefix => New_Reference_To (Ityp, Loc),
+ Attribute_Name => Name_Min,
+ Expressions => New_List (
+ Real_Hi,
+ Make_Integer_Literal (Loc, Entry_Family_Bound - 1)));
+
+ Real_Lo :=
+ Make_Attribute_Reference (Loc,
+ Prefix => New_Reference_To (Ityp, Loc),
+ Attribute_Name => Name_Max,
+ Expressions => New_List (
+ Real_Lo,
+ Make_Integer_Literal (Loc, -Entry_Family_Bound)));
+ end if;
+
+ return Make_Op_Subtract (Loc, Real_Hi, Real_Lo);
end Family_Offset;
-----------------
(Loc : Source_Ptr;
Hi : Node_Id;
Lo : Node_Id;
- Ttyp : Entity_Id) return Node_Id
+ Ttyp : Entity_Id;
+ Cap : Boolean) return Node_Id
is
Ityp : Entity_Id;
Expressions => New_List (
Make_Op_Add (Loc,
Left_Opnd =>
- Family_Offset (Loc, Hi, Lo, Ttyp),
+ Family_Offset (Loc, Hi, Lo, Ttyp, Cap),
Right_Opnd =>
Make_Integer_Literal (Loc, 1)),
Make_Integer_Literal (Loc, 0)));
begin
N := First (Visible_Declarations (T));
-
while Present (N) loop
if Nkind (N) = N_Pragma then
if Chars (N) = P then
end loop;
N := First (Private_Declarations (T));
-
while Present (N) loop
if Nkind (N) = N_Pragma then
if Chars (N) = P then
return First_Op;
end First_Protected_Operation;
+ ---------------------------------
+ -- Is_Potentially_Large_Family --
+ ---------------------------------
+
+ function Is_Potentially_Large_Family
+ (Base_Index : Entity_Id;
+ Conctyp : Entity_Id;
+ Lo : Node_Id;
+ Hi : Node_Id) return Boolean
+ is
+ begin
+ return Scope (Base_Index) = Standard_Standard
+ and then Base_Index = Base_Type (Standard_Integer)
+ and then Has_Discriminants (Conctyp)
+ and then Present
+ (Discriminant_Default_Value (First_Discriminant (Conctyp)))
+ and then
+ (Denotes_Discriminant (Lo, True)
+ or else Denotes_Discriminant (Hi, True));
+ end Is_Potentially_Large_Family;
+
--------------------------------
-- Index_Constant_Declaration --
--------------------------------
Lo : Node_Id := Type_Low_Bound (Etype (Index_Id));
function Replace_Discriminant (Bound : Node_Id) return Node_Id;
- -- The bounds of the entry index may depend on discriminants, so
- -- each declaration of an entry_index_constant must have its own
- -- subtype declaration, using the local renaming of the object discri-
- -- minant.
+ -- The bounds of the entry index may depend on discriminants, so each
+ -- declaration of an entry_index_constant must have its own subtype
+ -- declaration, using the local renaming of the object discriminant.
--------------------------
-- Replace_Discriminant --
Restricted : constant Boolean := Restricted_Profile;
begin
- -- We may need two calls to properly initialize the object, one
- -- to Initialize_Protection, and possibly one to Install_Handlers
- -- if we have a pragma Attach_Handler.
+ -- We may need two calls to properly initialize the object, one to
+ -- Initialize_Protection, and possibly one to Install_Handlers if we
+ -- have a pragma Attach_Handler.
-- Get protected declaration. In the case of a task type declaration,
- -- this is simply the parent of the protected type entity.
- -- In the single protected object
- -- declaration, this parent will be the implicit type, and we can find
- -- the corresponding single protected object declaration by
- -- searching forward in the declaration list in the tree.
- -- ??? I am not sure that the test for N_Single_Protected_Declaration
- -- is needed here. Nodes of this type should have been removed
- -- during semantic analysis.
+ -- this is simply the parent of the protected type entity. In the single
+ -- protected object declaration, this parent will be the implicit type,
+ -- and we can find the corresponding single protected object declaration
+ -- by searching forward in the declaration list in the tree.
- Pdec := Parent (Ptyp);
+ -- Is the test for N_Single_Protected_Declaration needed here??? Nodes
+ -- of this type should have been removed during semantic analysis.
+ Pdec := Parent (Ptyp);
while Nkind (Pdec) /= N_Protected_Type_Declaration
and then Nkind (Pdec) /= N_Single_Protected_Declaration
loop
if Present (Pdef)
and then Has_Priority_Pragma (Pdef)
then
- Append_To (Args,
- Duplicate_Subexpr_No_Checks
- (Expression
- (First
- (Pragma_Argument_Associations
- (Find_Task_Or_Protected_Pragma (Pdef, Name_Priority))))));
+ declare
+ Prio : constant Node_Id :=
+ Expression
+ (First
+ (Pragma_Argument_Associations
+ (Find_Task_Or_Protected_Pragma
+ (Pdef, Name_Priority))));
+ Temp : Entity_Id;
+
+ begin
+ -- If priority is a static expression, then we can duplicate it
+ -- with no problem and simply append it to the argument list.
+
+ if Is_Static_Expression (Prio) then
+ Append_To (Args,
+ Duplicate_Subexpr_No_Checks (Prio));
+
+ -- Otherwise, the priority may be a per-object expression, if it
+ -- depends on a discriminant of the type. In this case, create
+ -- local variable to capture the expression. Note that it is
+ -- really necessary to create this variable explicitly. It might
+ -- be thought that removing side effects would the appropriate
+ -- approach, but that could generate declarations improperly
+ -- placed in the enclosing scope.
+
+ -- Note: Use System.Any_Priority as the expected type for the
+ -- non-static priority expression, in case the expression has not
+ -- been analyzed yet (as occurs for example with pragma
+ -- Interrupt_Priority).
+
+ else
+ Temp :=
+ Make_Defining_Identifier (Loc, New_Internal_Name ('R'));
+
+ Append_To (L,
+ Make_Object_Declaration (Loc,
+ Defining_Identifier => Temp,
+ Object_Definition =>
+ New_Occurrence_Of (RTE (RE_Any_Priority), Loc),
+ Expression => Relocate_Node (Prio)));
+
+ Append_To (Args, New_Occurrence_Of (Temp, Loc));
+ end if;
+ end;
+
+ -- When no priority is specified but an xx_Handler pragma is, we default
+ -- to System.Interrupts.Default_Interrupt_Priority, see D.3(10).
elsif Has_Interrupt_Handler (Ptyp)
or else Has_Attach_Handler (Ptyp)
then
- -- When no priority is specified but an xx_Handler pragma is,
- -- we default to System.Interrupts.Default_Interrupt_Priority,
- -- see D.3(10).
-
Append_To (Args,
New_Reference_To (RTE (RE_Default_Interrupt_Priority), Loc));
+ -- Normal case, no priority or xx_Handler specified, default priority
+
else
Append_To (Args,
New_Reference_To (RTE (RE_Unspecified_Priority), Loc));
end if;
+ -- Test for Compiler_Info parameter. This parameter allows entry body
+ -- procedures and barrier functions to be called from the runtime. It
+ -- is a pointer to the record generated by the compiler to represent
+ -- the protected object.
+
if Has_Entry
or else Has_Interrupt_Handler (Ptyp)
or else Has_Attach_Handler (Ptyp)
+ or else (Ada_Version >= Ada_05
+ and then Present (Interface_List (Parent (Ptyp))))
then
- -- Compiler_Info parameter. This parameter allows entry body
- -- procedures and barrier functions to be called from the runtime.
- -- It is a pointer to the record generated by the compiler to
- -- represent the protected object.
-
if Has_Entry or else not Restricted then
Append_To (Args,
Make_Attribute_Reference (Loc,
Attribute_Name => Name_Address));
end if;
- if Has_Entry then
- -- Entry_Bodies parameter. This is a pointer to an array of
- -- pointers to the entry body procedures and barrier functions
- -- of the object. If the protected type has no entries this
- -- object will not exist; in this case, pass a null.
+ -- Entry_Bodies parameter. This is a pointer to an array of pointers
+ -- to the entry body procedures and barrier functions of the object.
+ -- If the protected type has no entries this object will not exist;
+ -- in this case, pass a null.
+ if Has_Entry then
P_Arr := Entry_Bodies_Array (Ptyp);
Append_To (Args,
if Abort_Allowed
or else Restriction_Active (No_Entry_Queue) = False
or else Number_Entries (Ptyp) > 1
+ or else (Has_Attach_Handler (Ptyp) and then not Restricted)
then
- -- Find index mapping function (clumsy but ok for now).
+ -- Find index mapping function (clumsy but ok for now)
while Ekind (P_Arr) /= E_Function loop
Next_Entity (P_Arr);
if Abort_Allowed
or else Restriction_Active (No_Entry_Queue) = False
or else Number_Entries (Ptyp) > 1
+ or else (Has_Attach_Handler (Ptyp)
+ and then not Restricted)
then
Append_To (L,
Make_Procedure_Call_Statement (Loc,
if Has_Attach_Handler (Ptyp) then
- -- We have a list of N Attach_Handler (ProcI, ExprI),
- -- and we have to make the following call:
+ -- We have a list of N Attach_Handler (ProcI, ExprI), and we have to
+ -- make the following call:
+
-- Install_Handlers (_object,
-- ((Expr1, Proc1'access), ...., (ExprN, ProcN'access));
+
-- or, in the case of Ravenscar:
+
-- Install_Handlers
-- ((Expr1, Proc1'access), ...., (ExprN, ProcN'access));
begin
if not Restricted then
+
-- Appends the _object argument
Append_To (Args,
Next_Rep_Item (Ritem);
end loop;
- -- Appends the table argument we just built.
+ -- Append the table argument we just built
+
Append_To (Args, Make_Aggregate (Loc, Table));
- -- Appends the Install_Handler call to the statements.
+ -- Append the Install_Handler call to the statements
+
Append_To (L,
Make_Procedure_Call_Statement (Loc,
Name => New_Reference_To (RTE (RE_Install_Handlers), Loc),
Ttyp := Corresponding_Concurrent_Type (Task_Rec);
Tnam := Chars (Ttyp);
- -- Get task declaration. In the case of a task type declaration, this
- -- is simply the parent of the task type entity. In the single task
+ -- Get task declaration. In the case of a task type declaration, this is
+ -- simply the parent of the task type entity. In the single task
-- declaration, this parent will be the implicit type, and we can find
- -- the corresponding single task declaration by searching forward in
- -- the declaration list in the tree.
- -- ??? I am not sure that the test for N_Single_Task_Declaration
- -- is needed here. Nodes of this type should have been removed
- -- during semantic analysis.
+ -- the corresponding single task declaration by searching forward in the
+ -- declaration list in the tree.
- Tdec := Parent (Ttyp);
+ -- Is the test for N_Single_Task_Declaration needed here??? Nodes of
+ -- this type should have been removed during semantic analysis.
+ Tdec := Parent (Ttyp);
while Nkind (Tdec) /= N_Task_Type_Declaration
and then Nkind (Tdec) /= N_Single_Task_Declaration
loop
-- Priority parameter. Set to Unspecified_Priority unless there is a
-- priority pragma, in which case we take the value from the pragma.
- if Present (Tdef)
- and then Has_Priority_Pragma (Tdef)
- then
+ if Present (Tdef) and then Has_Priority_Pragma (Tdef) then
Append_To (Args,
Make_Selected_Component (Loc,
Prefix => Make_Identifier (Loc, Name_uInit),
Selector_Name => Make_Identifier (Loc, Name_uPriority)));
-
else
Append_To (Args,
New_Reference_To (RTE (RE_Unspecified_Priority), Loc));
end if;
+ -- Optional Stack parameter
+
+ if Restricted_Profile then
+
+ -- If the stack has been preallocated by the expander then
+ -- pass its address. Otherwise, pass a null address.
+
+ if Preallocated_Stacks_On_Target then
+ Append_To (Args,
+ Make_Attribute_Reference (Loc,
+ Prefix => Make_Selected_Component (Loc,
+ Prefix => Make_Identifier (Loc, Name_uInit),
+ Selector_Name =>
+ Make_Identifier (Loc, Name_uStack)),
+ Attribute_Name => Name_Address));
+
+ else
+ Append_To (Args,
+ New_Reference_To (RTE (RE_Null_Address), Loc));
+ end if;
+ end if;
+
-- Size parameter. If no Storage_Size pragma is present, then
-- the size is taken from the taskZ variable for the type, which
-- is either Unspecified_Size, or has been reset by the use of
begin
Next_Op := Next (N);
-
while Present (Next_Op)
and then Nkind (Next_Op) /= N_Subprogram_Body
and then Nkind (Next_Op) /= N_Entry_Body
return Next_Op;
end Next_Protected_Operation;
+ --------------------------
+ -- Parameter_Block_Pack --
+ --------------------------
+
+ function Parameter_Block_Pack
+ (Loc : Source_Ptr;
+ Blk_Typ : Entity_Id;
+ Actuals : List_Id;
+ Formals : List_Id;
+ Decls : List_Id;
+ Stmts : List_Id) return Node_Id
+ is
+ Actual : Entity_Id;
+ Expr : Node_Id := Empty;
+ Formal : Entity_Id;
+ Has_Param : Boolean := False;
+ P : Entity_Id;
+ Params : List_Id;
+ Temp_Asn : Node_Id;
+ Temp_Nam : Node_Id;
+
+ begin
+ Actual := First (Actuals);
+ Formal := Defining_Identifier (First (Formals));
+ Params := New_List;
+
+ while Present (Actual) loop
+ if Is_By_Copy_Type (Etype (Actual)) then
+ -- Generate:
+ -- Jnn : aliased <formal-type>
+
+ Temp_Nam :=
+ Make_Defining_Identifier (Loc, New_Internal_Name ('J'));
+
+ Append_To (Decls,
+ Make_Object_Declaration (Loc,
+ Aliased_Present =>
+ True,
+ Defining_Identifier =>
+ Temp_Nam,
+ Object_Definition =>
+ New_Reference_To (Etype (Formal), Loc)));
+
+ if Ekind (Formal) /= E_Out_Parameter then
+
+ -- Generate:
+ -- Jnn := <actual>
+
+ Temp_Asn :=
+ New_Reference_To (Temp_Nam, Loc);
+
+ Set_Assignment_OK (Temp_Asn);
+
+ Append_To (Stmts,
+ Make_Assignment_Statement (Loc,
+ Name =>
+ Temp_Asn,
+ Expression =>
+ New_Copy_Tree (Actual)));
+ end if;
+
+ -- Generate:
+ -- Jnn'unchecked_access
+
+ Append_To (Params,
+ Make_Attribute_Reference (Loc,
+ Attribute_Name =>
+ Name_Unchecked_Access,
+ Prefix =>
+ New_Reference_To (Temp_Nam, Loc)));
+
+ Has_Param := True;
+
+ -- The controlling parameter is omitted
+
+ else
+ if not Is_Controlling_Actual (Actual) then
+ Append_To (Params,
+ Make_Reference (Loc, New_Copy_Tree (Actual)));
+
+ Has_Param := True;
+ end if;
+ end if;
+
+ Next_Actual (Actual);
+ Next_Formal_With_Extras (Formal);
+ end loop;
+
+ if Has_Param then
+ Expr := Make_Aggregate (Loc, Params);
+ end if;
+
+ -- Generate:
+ -- P : Ann := (
+ -- J1'unchecked_access;
+ -- <actual2>'reference;
+ -- ...);
+
+ P := Make_Defining_Identifier (Loc, New_Internal_Name ('P'));
+
+ Append_To (Decls,
+ Make_Object_Declaration (Loc,
+ Defining_Identifier =>
+ P,
+ Object_Definition =>
+ New_Reference_To (Blk_Typ, Loc),
+ Expression =>
+ Expr));
+
+ return P;
+ end Parameter_Block_Pack;
+
+ ----------------------------
+ -- Parameter_Block_Unpack --
+ ----------------------------
+
+ function Parameter_Block_Unpack
+ (Loc : Source_Ptr;
+ P : Entity_Id;
+ Actuals : List_Id;
+ Formals : List_Id) return List_Id
+ is
+ Actual : Entity_Id;
+ Asnmt : Node_Id;
+ Formal : Entity_Id;
+ Has_Asnmt : Boolean := False;
+ Result : constant List_Id := New_List;
+
+ begin
+ Actual := First (Actuals);
+ Formal := Defining_Identifier (First (Formals));
+ while Present (Actual) loop
+ if Is_By_Copy_Type (Etype (Actual))
+ and then Ekind (Formal) /= E_In_Parameter
+ then
+ -- Generate:
+ -- <actual> := P.<formal>;
+
+ Asnmt :=
+ Make_Assignment_Statement (Loc,
+ Name =>
+ New_Copy (Actual),
+ Expression =>
+ Make_Explicit_Dereference (Loc,
+ Make_Selected_Component (Loc,
+ Prefix =>
+ New_Reference_To (P, Loc),
+ Selector_Name =>
+ Make_Identifier (Loc, Chars (Formal)))));
+
+ Set_Assignment_OK (Name (Asnmt));
+ Append_To (Result, Asnmt);
+
+ Has_Asnmt := True;
+ end if;
+
+ Next_Actual (Actual);
+ Next_Formal_With_Extras (Formal);
+ end loop;
+
+ if Has_Asnmt then
+ return Result;
+ else
+ return New_List (Make_Null_Statement (Loc));
+ end if;
+ end Parameter_Block_Unpack;
+
----------------------
-- Set_Discriminals --
----------------------
if Has_Discriminants (Pdef) then
D := First_Discriminant (Pdef);
-
while Present (D) loop
D_Minal :=
Make_Defining_Identifier (Sloc (D),
-----------------
procedure Set_Privals
- (Dec : Node_Id;
- Op : Node_Id;
- Loc : Source_Ptr)
+ (Dec : Node_Id;
+ Op : Node_Id;
+ Loc : Source_Ptr;
+ After_Barrier : Boolean := False)
is
- P_Decl : Node_Id;
- P_Id : Entity_Id;
- Priv : Entity_Id;
- Def : Node_Id;
- Body_Ent : Entity_Id;
+ P_Decl : Node_Id;
+ P_Id : Entity_Id;
+ Priv : Entity_Id;
+ Def : Node_Id;
+ Body_Ent : Entity_Id;
+ For_Barrier : constant Boolean :=
+ Nkind (Op) = N_Entry_Body and then not After_Barrier;
+
Prec_Decl : constant Node_Id :=
Parent (Corresponding_Record_Type
(Defining_Identifier (Dec)));
Def := Protected_Definition (Dec);
if Present (Private_Declarations (Def)) then
-
P_Decl := First (Private_Declarations (Def));
-
while Present (P_Decl) loop
if Nkind (P_Decl) = N_Component_Declaration then
P_Id := Defining_Identifier (P_Decl);
- Priv :=
- Make_Defining_Identifier (Loc,
- New_External_Name (Chars (P_Id), 'P'));
+
+ if For_Barrier then
+ Priv :=
+ Make_Defining_Identifier (Loc,
+ Chars => New_External_Name (Chars (P_Id), 'P'));
+ else
+ Priv :=
+ Make_Defining_Identifier (Loc,
+ Chars => New_External_Name (Chars (P_Id)));
+ end if;
Set_Ekind (Priv, E_Variable);
Set_Etype (Priv, Etype (P_Id));
Set_Esize (Priv, Esize (Etype (P_Id)));
Set_Alignment (Priv, Alignment (Etype (P_Id)));
- -- If the type of the component is an itype, we must
- -- create a new itype for the corresponding prival in
- -- each protected operation, to avoid scoping problems.
- -- We create new itypes by copying the tree for the
- -- component definition.
-
- if Is_Itype (Etype (P_Id)) then
+ -- If the type of the component is an itype, we must create a
+ -- new itype for the corresponding prival in each protected
+ -- operation, to avoid scoping problems. We create new itypes
+ -- by copying the tree for the component definition.
+ -- (Ada 2005) If the itype is an anonymous access type created
+ -- for an access definition for a component, it is declared in
+ -- the enclosing scope, and we do no create a local version of
+ -- it, to prevent scoping anomalies in gigi.
+
+ if Is_Itype (Etype (P_Id))
+ and then not
+ (Is_Access_Type (Etype (P_Id))
+ and then Is_Local_Anonymous_Access (Etype (P_Id)))
+ then
Append_Elmt (P_Id, Assoc_L);
Append_Elmt (Priv, Assoc_L);
end loop;
end if;
- -- There is one more implicit private declaration: the object
- -- itself. A "prival" for this is attached to the protected
- -- body defining identifier.
+ -- There is one more implicit private decl: the object itself. "prival"
+ -- for this is attached to the protected body defining identifier.
Body_Ent := Corresponding_Body (Dec);
end loop;
P_Subtype := Etype (Defining_Identifier (Obj_Decl));
+ Set_Ekind (Priv, E_Variable);
Set_Etype (Priv, P_Subtype);
Set_Is_Aliased (Priv);
Set_Object_Ref (Body_Ent, Priv);
if Is_Entity_Name (N) then
declare
E : constant Entity_Id := Entity (N);
-
begin
if Present (E)
and then (Ekind (E) = E_Constant
and then not Is_Scalar_Type (Etype (E))
and then Etype (N) /= Etype (E)
then
- Set_Etype (N, Etype (Entity (Original_Node (N))));
+
+ -- Ensure that reference and entity have the same Etype,
+ -- to prevent back-end inconsistencies.
+
+ Set_Etype (N, Etype (E));
Update_Index_Types (N);
elsif Present (E)
return Skip;
elsif Nkind (N) = N_String_Literal then
- -- array type, but bounds are constant.
+
+ -- Array type, but bounds are constant
+
return OK;
elsif Nkind (N) = N_Object_Declaration
Update_Array_Bounds (Etype (Defining_Identifier (N)));
return OK;
- -- For array components of discriminated records, use the
- -- base type directly, because it may depend indirectly
- -- on the discriminants of the protected type. Cleaner would
- -- be a systematic mechanism to compute actual subtypes of
- -- private components ???
+ -- For array components of discriminated records, use the base type
+ -- directly, because it may depend indirectly on the discriminants of
+ -- the protected type.
+
+ -- Cleaner would be a systematic mechanism to compute actual subtypes
+ -- of private components???
elsif Nkind (N) in N_Has_Etype
and then Present (Etype (N))
procedure Update_Array_Bounds (E : Entity_Id) is
Ind : Node_Id;
-
begin
Ind := First_Index (E);
-
while Present (Ind) loop
Update_Prival_Subtypes (Type_Low_Bound (Etype (Ind)));
Update_Prival_Subtypes (Type_High_Bound (Etype (Ind)));
procedure Update_Index_Types (N : Node_Id) is
Indx1 : Node_Id;
I_Typ : Node_Id;
+
begin
- -- If the prefix has an actual subtype that is different
- -- from the nominal one, update the types of the indices,
- -- so that the proper constraints are applied. Do not
- -- apply this transformation to a packed array, where the
- -- index type is computed for a byte array and is different
- -- from the source index.
+ -- If the prefix has an actual subtype that is different from the
+ -- nominal one, update the types of the indices, so that the proper
+ -- constraints are applied. Do not apply this transformation to a
+ -- packed array, where the index type is computed for a byte array
+ -- and is different from the source index.
if Nkind (Parent (N)) = N_Indexed_Component
and then
end if;
end Update_Index_Types;
- procedure Traverse is new Traverse_Proc;
+ procedure Traverse is new Traverse_Proc (Process);
-- Start of processing for Update_Prival_Subtypes
OSDN Git Service
