From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 40A6E398A86D; Wed, 16 Jun 2021 08:44:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 40A6E398A86D MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1500] [Ada] ACATS 4.1R-c611a04: Class-wide preconditions in dispatching calls X-Act-Checkin: gcc X-Git-Author: Javier Miranda X-Git-Refname: refs/heads/master X-Git-Oldrev: a2d2310d80ae992306f97764a850c56e70a1a8e3 X-Git-Newrev: cbb64f6b9ac870176700a2fa723a3b21a53b9b29 Message-Id: <20210616084422.40A6E398A86D@sourceware.org> Date: Wed, 16 Jun 2021 08:44:22 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 08:44:22 -0000 https://gcc.gnu.org/g:cbb64f6b9ac870176700a2fa723a3b21a53b9b29 commit r12-1500-gcbb64f6b9ac870176700a2fa723a3b21a53b9b29 Author: Javier Miranda Date: Thu Feb 18 13:47:10 2021 -0500 [Ada] ACATS 4.1R-c611a04: Class-wide preconditions in dispatching calls gcc/ada/ * exp_disp.adb (Build_Class_Wide_Check): Ensure that evaluation of actuals is side effects free (since the check duplicates actuals). Diff: --- gcc/ada/exp_disp.adb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb index 20a32cd9576..eb6b352bef9 100644 --- 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.