public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-1518] [Ada] Cleanup repeated calls in Sloc_Range
@ 2021-06-16 8:45 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2021-06-16 8:45 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:207962b929cc771fd560c467f44efe8f9f679ac4
commit r12-1518-g207962b929cc771fd560c467f44efe8f9f679ac4
Author: Piotr Trojanek <trojanek@adacore.com>
Date: Wed Mar 3 11:45:41 2021 +0100
[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:
---
gcc/ada/sinput.adb | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/gcc/ada/sinput.adb b/gcc/ada/sinput.adb
index df61856d57c..e62bf4565e1 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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-16 8:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-16 8:45 [gcc r12-1518] [Ada] Cleanup repeated calls in Sloc_Range Pierre-Marie de Rodat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).