From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 13DC83838001; Tue, 10 May 2022 08:22:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 13DC83838001 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-247] [Ada] Remove repeated conversions between Source_Ptr and Int X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: ce63a97b518915b3b6c1221da60af719c7eccd5a X-Git-Newrev: 45c4d9193dd33013522ff7e7f8f90f77d20cb7be Message-Id: <20220510082244.13DC83838001@sourceware.org> Date: Tue, 10 May 2022 08:22:44 +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: Tue, 10 May 2022 08:22:44 -0000 https://gcc.gnu.org/g:45c4d9193dd33013522ff7e7f8f90f77d20cb7be commit r13-247-g45c4d9193dd33013522ff7e7f8f90f77d20cb7be Author: Piotr Trojanek Date: Thu Jan 20 18:05:39 2022 +0100 [Ada] Remove repeated conversions between Source_Ptr and Int Both Source_Ptr and Int are integer types (and even happen to have equal ranges). Their values can be calculated without converting back-and-forth, e.g.: Int (Loc1) - Int (Loc2) can be written simply as: Int (Loc1 - Loc2) Code cleanup related to handling of references to unset objects. Offending occurrences found with various invocations of grep. gcc/ada/ * par-ch10.adb, scng.adb, sem_res.adb, sinfo-utils.adb, treepr.adb: Simplify calculations with Source_Ptr and Loc values. Diff: --- gcc/ada/par-ch10.adb | 2 +- gcc/ada/scng.adb | 6 +----- gcc/ada/sem_res.adb | 4 ++-- gcc/ada/sinfo-utils.adb | 4 ++-- gcc/ada/treepr.adb | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/gcc/ada/par-ch10.adb b/gcc/ada/par-ch10.adb index 901ad17115e..613be37fe75 100644 --- a/gcc/ada/par-ch10.adb +++ b/gcc/ada/par-ch10.adb @@ -1194,7 +1194,7 @@ package body Ch10 is Write_Int (Int (Line)); Write_Str (", file offset "); - Write_Int (Int (Loc) - Int (Source_First (Sind))); + Write_Int (Int (Loc - Source_First (Sind))); end Unit_Location; end Ch10; diff --git a/gcc/ada/scng.adb b/gcc/ada/scng.adb index 676a4f2898c..c50a41e94dc 100644 --- a/gcc/ada/scng.adb +++ b/gcc/ada/scng.adb @@ -130,11 +130,7 @@ package body Scng is procedure Check_End_Of_Line is Len : constant Int := - Int (Scan_Ptr) - - Int (Current_Line_Start) - - Wide_Char_Byte_Count; - - -- Start of processing for Check_End_Of_Line + Int (Scan_Ptr - Current_Line_Start) - Wide_Char_Byte_Count; begin if Style_Check then diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index a59ffe70be0..125366b4973 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -11754,7 +11754,7 @@ package body Sem_Res is Error_Msg ("literal out of range of type Standard.Character", - Source_Ptr (Int (Loc) + J)); + Loc + Source_Ptr (J)); return; end if; end loop; @@ -11783,7 +11783,7 @@ package body Sem_Res is Error_Msg ("literal out of range of type Standard.Wide_Character", - Source_Ptr (Int (Loc) + J)); + Loc + Source_Ptr (J)); return; end if; end loop; diff --git a/gcc/ada/sinfo-utils.adb b/gcc/ada/sinfo-utils.adb index 121a0398f4a..35288916b8a 100644 --- a/gcc/ada/sinfo-utils.adb +++ b/gcc/ada/sinfo-utils.adb @@ -191,7 +191,7 @@ package body Sinfo.Utils is function End_Location (N : Node_Id) return Source_Ptr is L : constant Valid_Uint := End_Span (N); begin - return Source_Ptr (Int (Sloc (N)) + UI_To_Int (L)); + return Sloc (N) + Source_Ptr (UI_To_Int (L)); end End_Location; -------------------- @@ -214,7 +214,7 @@ package body Sinfo.Utils is procedure Set_End_Location (N : Node_Id; S : Source_Ptr) is begin Set_End_Span (N, - UI_From_Int (Int (S) - Int (Sloc (N)))); + UI_From_Int (Int (S - Sloc (N)))); end Set_End_Location; -------------------------- diff --git a/gcc/ada/treepr.adb b/gcc/ada/treepr.adb index 2faf3f85656..3173668d82a 100644 --- a/gcc/ada/treepr.adb +++ b/gcc/ada/treepr.adb @@ -1229,7 +1229,7 @@ package body Treepr is else Sfile := Get_Source_File_Index (Sloc (N)); - Print_Int (Int (Sloc (N)) - Int (Source_Text (Sfile)'First)); + Print_Int (Int (Sloc (N) - Source_Text (Sfile)'First)); Write_Str (" "); Write_Location (Sloc (N)); end if;