From: Piotr Trojanek <trojanek@adacore.com>
Date: Wed, 23 Aug 2023 14:44:57 +0000 (+0200)
Subject: ada: Remove redundant protection against empty list
X-Git-Tag: basepoints/gcc-15~6442
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10b4a454b2f5c2c3c6c98b4f7bf6bcf537c072cc;p=thirdparty%2Fgcc.git

ada: Remove redundant protection against empty list

Calls to First on No_List intentionally return Empty, so explicit guards
against No_List are unnecessary. Code cleanup; semantics is unaffected.

gcc/ada/

	* sem_type.adb (Interface_Present_In_Ancestor): Remove guard against no
	list of interfaces; fix style in comments (trailing dots).
---

diff --git a/gcc/ada/sem_type.adb b/gcc/ada/sem_type.adb
index 8579130cdac6..40de2951e208 100644
--- a/gcc/ada/sem_type.adb
+++ b/gcc/ada/sem_type.adb
@@ -2649,34 +2649,32 @@ package body Sem_Type is
       --  In case of concurrent types we can't use the Corresponding Record_Typ
       --  to look for the interface because it is built by the expander (and
       --  hence it is not always available). For this reason we traverse the
-      --  list of interfaces (available in the parent of the concurrent type)
+      --  list of interfaces (available in the parent of the concurrent type).
 
       if Is_Concurrent_Type (Target_Typ) then
-         if Present (Interface_List (Parent (Target_Typ))) then
-            declare
-               AI : Node_Id;
+         declare
+            AI : Node_Id;
 
-            begin
-               AI := First (Interface_List (Parent (Target_Typ)));
+         begin
+            AI := First (Interface_List (Parent (Target_Typ)));
 
-               --  The progenitor itself may be a subtype of an interface type.
+            --  The progenitor itself may be a subtype of an interface type
 
-               while Present (AI) loop
-                  if Etype (AI) = Iface_Typ
-                    or else Base_Type (Etype (AI)) = Iface_Typ
-                  then
-                     return True;
+            while Present (AI) loop
+               if Etype (AI) = Iface_Typ
+                 or else Base_Type (Etype (AI)) = Iface_Typ
+               then
+                  return True;
 
-                  elsif Present (Interfaces (Etype (AI)))
-                    and then Iface_Present_In_Ancestor (Etype (AI))
-                  then
-                     return True;
-                  end if;
+               elsif Present (Interfaces (Etype (AI)))
+                 and then Iface_Present_In_Ancestor (Etype (AI))
+               then
+                  return True;
+               end if;
 
-                  Next (AI);
-               end loop;
-            end;
-         end if;
+               Next (AI);
+            end loop;
+         end;
 
          return False;
       end if;