From: Piotr Trojanek <trojanek@adacore.com>
Date: Wed, 3 Mar 2021 10:45:41 +0000 (+0100)
Subject: [Ada] Cleanup repeated calls in Sloc_Range
X-Git-Tag: basepoints/gcc-13~6795
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=207962b929cc771fd560c467f44efe8f9f679ac4;p=thirdparty%2Fgcc.git

[Ada] Cleanup repeated calls in Sloc_Range

gcc/ada/

	* sinput.adb (Sloc_Range): Refactor several repeated calls to
	Sloc and two comparisons with No_Location.
---

diff --git a/gcc/ada/sinput.adb b/gcc/ada/sinput.adb
index df61856d57cf..e62bf4565e13 100644
--- a/gcc/ada/sinput.adb
+++ b/gcc/ada/sinput.adb
@@ -933,7 +933,7 @@ package body Sinput is
 
    procedure Sloc_Range (N : Node_Id; Min, Max : out Source_Ptr) is
 
-      Indx : constant Source_File_Index :=  Get_Source_File_Index (Sloc (N));
+      Indx : constant Source_File_Index := Get_Source_File_Index (Sloc (N));
 
       function Process (N : Node_Id) return Traverse_Result;
       --  Process function for traversing the node tree
@@ -945,25 +945,22 @@ package body Sinput is
       -------------
 
       function Process (N : Node_Id) return Traverse_Result is
-         Orig : constant Node_Id := Original_Node (N);
+         Loc : constant Source_Ptr := Sloc (Original_Node (N));
 
       begin
          --  Skip nodes that may have been added during expansion and
          --  that originate in other units, such as code for contracts
          --  in subprogram bodies.
 
-         if Get_Source_File_Index (Sloc (Orig)) /= Indx then
+         if Get_Source_File_Index (Loc) /= Indx then
             return Skip;
          end if;
 
-         if Sloc (Orig) < Min then
-            if Sloc (Orig) > No_Location then
-               Min := Sloc (Orig);
-            end if;
-
-         elsif Sloc (Orig) > Max then
-            if Sloc (Orig) > No_Location then
-               Max := Sloc (Orig);
+         if Loc > No_Location then
+            if Loc < Min then
+               Min := Loc;
+            elsif Loc > Max then
+               Max := Loc;
             end if;
          end if;
 
@@ -974,7 +971,7 @@ package body Sinput is
 
    begin
       Min := Sloc (N);
-      Max := Sloc (N);
+      Max := Min;
       Traverse (N);
    end Sloc_Range;