diff options
Diffstat (limited to 'gcc/ada/exp_ch9.adb')
| -rw-r--r-- | gcc/ada/exp_ch9.adb | 99 |
1 files changed, 4 insertions, 95 deletions
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb index db76edddf79..7620236b82f 100644 --- a/gcc/ada/exp_ch9.adb +++ b/gcc/ada/exp_ch9.adb @@ -4904,9 +4904,7 @@ package body Exp_Ch9 is Ldecl2 : Node_Id; begin - if Expander_Active - and then not ALFA_Mode - then + if Full_Expander_Active then -- If we have no handled statement sequence, we may need to build -- a dummy sequence consisting of a null statement. This can be -- skipped if the trivial accept optimization is permitted. @@ -5227,9 +5225,7 @@ package body Exp_Ch9 is -- barrier just as a protected function, and discard the protected -- version of it because it is never called. - if Expander_Active - and then not ALFA_Mode - then + if Full_Expander_Active then B_F := Build_Barrier_Function (N, Ent, Prot); Func := Barrier_Function (Ent); Set_Corresponding_Spec (B_F, Func); @@ -5267,8 +5263,7 @@ package body Exp_Ch9 is -- condition does not reference any of the generated renamings -- within the function. - if Expander_Active - and then not ALFA_Mode + if Full_Expander_Active and then Scope (Entity (Cond)) /= Func then Set_Declarations (B_F, Empty_List); @@ -5320,12 +5315,6 @@ package body Exp_Ch9 is Tasknm : Node_Id; begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - Aggr := Make_Aggregate (Loc, Component_Associations => New_List); Count := 0; @@ -5457,12 +5446,6 @@ package body Exp_Ch9 is -- Start of processing for Expand_N_Accept_Statement begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - -- If accept statement is not part of a list, then its parent must be -- an accept alternative, and, as described above, we do not do any -- expansion for such accept statements at this level. @@ -5913,12 +5896,6 @@ package body Exp_Ch9 is T : Entity_Id; -- Additional status flag begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - Process_Statements_For_Controlled_Objects (Trig); Process_Statements_For_Controlled_Objects (Abrt); @@ -6868,12 +6845,6 @@ package body Exp_Ch9 is S : Entity_Id; -- Primitive operation slot begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - Process_Statements_For_Controlled_Objects (N); if Ada_Version >= Ada_2005 @@ -7190,12 +7161,6 @@ package body Exp_Ch9 is procedure Expand_N_Delay_Relative_Statement (N : Node_Id) is Loc : constant Source_Ptr := Sloc (N); begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - Rewrite (N, Make_Procedure_Call_Statement (Loc, Name => New_Reference_To (RTE (RO_CA_Delay_For), Loc), @@ -7215,12 +7180,6 @@ package body Exp_Ch9 is Typ : Entity_Id; begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - if Is_RTE (Base_Type (Etype (Expression (N))), RO_CA_Time) then Typ := RTE (RO_CA_Delay_Until); else @@ -7241,12 +7200,6 @@ package body Exp_Ch9 is procedure Expand_N_Entry_Body (N : Node_Id) is begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - -- Associate discriminals with the next protected operation body to be -- expanded. @@ -7268,12 +7221,6 @@ package body Exp_Ch9 is Index : Node_Id; begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - if No_Run_Time_Mode then Error_Msg_CRT ("entry call", N); return; @@ -7330,12 +7277,6 @@ package body Exp_Ch9 is Acc_Ent : Entity_Id; begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - Formal := First_Formal (Entry_Ent); Last_Decl := N; @@ -7604,12 +7545,6 @@ package body Exp_Ch9 is -- Start of processing for Expand_N_Protected_Body begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - if No_Run_Time_Mode then Error_Msg_CRT ("protected body", N); return; @@ -9162,12 +9097,6 @@ package body Exp_Ch9 is -- Start of processing for Expand_N_Requeue_Statement begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - -- Extract the components of the entry call Extract_Entry (N, Concval, Ename, Index); @@ -9754,12 +9683,6 @@ package body Exp_Ch9 is -- Start of processing for Expand_N_Selective_Accept begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - Process_Statements_For_Controlled_Objects (N); -- First insert some declarations before the select. The first is: @@ -10390,12 +10313,6 @@ package body Exp_Ch9 is -- Used to determine the proper location of wrapper body insertions begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - -- Add renaming declarations for discriminals and a declaration for the -- entry family index (if applicable). @@ -11142,12 +11059,6 @@ package body Exp_Ch9 is S : Entity_Id; -- Primitive operation slot begin - -- Do not expand tasking constructs in formal verification mode - - if ALFA_Mode then - return; - end if; - -- Under the Ravenscar profile, timed entry calls are excluded. An error -- was already reported on spec, so do not attempt to expand the call. @@ -11592,9 +11503,7 @@ package body Exp_Ch9 is Error_Msg_CRT ("protected body", N); return; - elsif Expander_Active - and then not ALFA_Mode - then + elsif Full_Expander_Active then -- Associate discriminals with the first subprogram or entry body to -- be expanded. |