Completing previous patch since it introduced a regression on ACATS
c611a03 under certified runtime.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* exp_disp.adb (Build_Class_Wide_Check): Ensure that evaluation
of actuals is side effects free (since the check duplicates
actuals).diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb
--- a/gcc/ada/exp_disp.adb
+++ b/gcc/ada/exp_disp.adb
@@ -868,6 +868,7 @@ package body Exp_Disp is
Str_Loc : constant String := Build_Location_String (Loc);
+ A : Node_Id;
Cond : Node_Id;
Msg : Node_Id;
Prec : Node_Id;
@@ -900,6 +901,15 @@ package body Exp_Disp is
return;
end if;
+ -- Ensure that the evaluation of the actuals will not produce side
+ -- effects (since the check will use a copy of the actuals).
+
+ A := First_Actual (Call_Node);
+ while Present (A) loop
+ Remove_Side_Effects (A);
+ Next_Actual (A);
+ end loop;
+
-- The expression for the precondition is analyzed within the
-- generated pragma. The message text is the last parameter of
-- the generated pragma, indicating source of precondition.
