From 405ebd743d392d2b0afd384e0955e3922e388ca9 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Thu, 9 Jun 2022 22:01:06 +0200 Subject: [PATCH] [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. --- 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 d6d9d008a55e..b5764ad12e1f 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 5aa9fbc8015d..df13e9f80b00 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 -- 2.47.2