commit a6d844cd860880a9d1f028876085a8d1230819b1
author Piotr Trojanek <trojanek@adacore.com> Wed Mar 10 09:26:18 2021 +0100
committer Pierre-Marie de Rodat <derodat@adacore.com> Thu Jun 17 10:32:13 2021 -0400
tree 5e23cfaecfed4d51f17a281177aa799632278f07
parent 679124db5bc81cca40d33543916cd82981601f06

[Ada] Check all pairs of actuals for overlapping

gcc/ada/

	* sem_warn.adb (Warn_On_Overlapping_Actuals): Fix style;
	refactor repeated calls to Nkind; remove early RETURN.

gcc/ada/sem_warn.adb

diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb
index 6db6d2c..7289274 100644
--- a/gcc/ada/sem_warn.adb
+++ b/gcc/ada/sem_warn.adb
@@ -3693,10 +3693,10 @@
 
       --  Local variables
 
-      Act1      : Node_Id;
-      Act2      : Node_Id;
-      Form1     : Entity_Id;
-      Form2     : Entity_Id;
+      Act1  : Node_Id;
+      Act2  : Node_Id;
+      Form1 : Entity_Id;
+      Form2 : Entity_Id;
 
    --  Start of processing for Warn_On_Overlapping_Actuals
 
@@ -3708,9 +3708,7 @@
 
       --  Exclude calls rewritten as enumeration literals
 
-      if Nkind (N) not in N_Subprogram_Call
-        and then Nkind (N) /= N_Entry_Call_Statement
-      then
+      if Nkind (N) not in N_Subprogram_Call | N_Entry_Call_Statement then
          return;
       end if;
 
@@ -3879,8 +3877,6 @@
                      end if;
                   end if;
                end if;
-
-               return;
             end if;
 
             Next_Formal (Form2);