@@ -2451,11 +2451,15 @@ package body Exp_Util is
-- Case of appearing within an Expressions_With_Actions node. We
- -- prepend the actions to the list of actions already there.
+ -- prepend the actions to the list of actions already there, if
+ -- the node has not been analyzed yet. Otherwise find insertion
+ -- location further up the tree.
when N_Expression_With_Actions =>
- Prepend_List (Ins_Actions, Actions (P));
+ if not Analyzed (P) then
+ Prepend_List (Ins_Actions, Actions (P));
+ end if;
-- Case of appearing in the condition of a while expression or
-- elsif. We insert the actions into the Condition_Actions field.
@@ -939,6 +939,16 @@ package body Sem_Elab is
Attribute_Name => Name_Elaborated,
Prefix => New_Occurrence_Of (Spec_Entity (E_Scope), Loc)));
+ -- Prevent duplicate elaboration checks on the same call,
+ -- which can happen if the body enclosing the call appears
+ -- itself in a call whose elaboration check is delayed.
+ Nkind_In (N, N_Function_Call, N_Procedure_Call_Statement)
+ Set_No_Elaboration_Check (N);
+ end if;
-- Case of static elaboration model