https://gcc.gnu.org/g:69dfa02bdb9eaadc24552f280a390a0737386a54

commit r15-6632-g69dfa02bdb9eaadc24552f280a390a0737386a54
Author: Piotr Trojanek <troja...@adacore.com>
Date:   Thu Mar 2 22:43:12 2023 +0100

    ada: Remove unnecessary qualifiers for First/Next list operations
    
    Code cleanup related to work on expression functions for GNATprove
    (which require accessibility checks even when they are not expanded
    and thus have no explicit return statements).
    
    gcc/ada/ChangeLog:
    
            * accessibility.adb (First_Selector): Remove redundant and locally
            inconsistent parenthesis.
            (Check_Return_Construct_Accessibility): Remove qualifier from list
            operation.
            * sem_util.adb (Is_Prim_Of_Abst_Type_With_Nonstatic_CW_Pre_Post):
            Likewise.

Diff:
---
 gcc/ada/accessibility.adb | 6 +++---
 gcc/ada/sem_util.adb      | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gcc/ada/accessibility.adb b/gcc/ada/accessibility.adb
index 376eb9d0bb94..1d7d3a137862 100644
--- a/gcc/ada/accessibility.adb
+++ b/gcc/ada/accessibility.adb
@@ -1213,7 +1213,7 @@ package body Accessibility is
             return First (Choices (Assoc));
 
          elsif Nkind (Assoc) = N_Discriminant_Association then
-            return (First (Selector_Names (Assoc)));
+            return First (Selector_Names (Assoc));
 
          else
             raise Program_Error;
@@ -1292,7 +1292,7 @@ package body Accessibility is
                exit;
             end if;
 
-            Nlists.Next (Return_Con);
+            Next (Return_Con);
          end loop;
 
          pragma Assert (Present (Return_Con));
@@ -1693,7 +1693,7 @@ package body Accessibility is
          if not Is_List_Member (Assoc) then
             exit;
          else
-            Nlists.Next (Assoc);
+            Next (Assoc);
          end if;
       end loop;
    end Check_Return_Construct_Accessibility;
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 24f27d081673..a11afa8be2d3 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -12654,8 +12654,7 @@ package body Sem_Util is
               and then Class_Present (Prag)
             then
                Pragma_Arg :=
-                 Nlists.First
-                   (Pragma_Argument_Associations (Prag));
+                 First (Pragma_Argument_Associations (Prag));
 
                if not Is_Static_Expression (Expression (Pragma_Arg)) then
                   return True;

Reply via email to