From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id ABFE7385800F; Wed, 6 Jul 2022 13:30:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ABFE7385800F 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 r13-1520] [Ada] Remove explicit call to Make_Unchecked_Type_Conversion X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: 3fdb556c8387024493509a9f19f886617eced601 X-Git-Newrev: 405ebd743d392d2b0afd384e0955e3922e388ca9 Message-Id: <20220706133021.ABFE7385800F@sourceware.org> Date: Wed, 6 Jul 2022 13:30:21 +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, 06 Jul 2022 13:30:21 -0000 https://gcc.gnu.org/g:405ebd743d392d2b0afd384e0955e3922e388ca9 commit r13-1520-g405ebd743d392d2b0afd384e0955e3922e388ca9 Author: Piotr Trojanek Date: Thu Jun 9 22:01:06 2022 +0200 [Ada] Remove explicit call to Make_Unchecked_Type_Conversion Respect a comment in sinfo.ads, which says: "Unchecked type conversion nodes should be created by calling Tbuild.Unchecked_Convert_To, rather than by directly calling Nmake.Make_Unchecked_Type_Conversion." No test appears to be affected by this change, so this is just a cleanup. gcc/ada/ * exp_ch6.adb (Build_Static_Check_Helper_Call): Replace explicit call to Make_Unchecked_Type_Conversion with a call to Unchecked_Convert_To. * tbuild.adb (Unchecked_Convert_To): Fix whitespace. Diff: --- gcc/ada/exp_ch6.adb | 4 +--- gcc/ada/tbuild.adb | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index d6d9d008a55..b5764ad12e1 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -7578,9 +7578,7 @@ package body Exp_Ch6 is and then Etype (F) /= Etype (A) then Append_To (Actuals, - Make_Unchecked_Type_Conversion (Loc, - New_Occurrence_Of (Etype (F), Loc), - New_Copy_Tree (A))); + Unchecked_Convert_To (Etype (F), New_Copy_Tree (A))); else Append_To (Actuals, New_Copy_Tree (A)); end if; diff --git a/gcc/ada/tbuild.adb b/gcc/ada/tbuild.adb index 5aa9fbc8015..df13e9f80b0 100644 --- a/gcc/ada/tbuild.adb +++ b/gcc/ada/tbuild.adb @@ -882,8 +882,8 @@ package body Tbuild is -- We don't really want to allow E_Void here, but existing code passes -- it. - Loc : constant Source_Ptr := Sloc (Expr); - Result : Node_Id; + Loc : constant Source_Ptr := Sloc (Expr); + Result : Node_Id; begin -- If the expression is already of the correct type, then nothing