From: Piotr Trojanek <trojanek@adacore.com>
Date: Tue, 5 Mar 2024 13:42:08 +0000 (+0100)
Subject: ada: Only record types with discriminants can be unconstrained
X-Git-Tag: basepoints/gcc-16~8957
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=376a8ea17dfb3dc1267dc88bd90e5f84b82aadaa;p=thirdparty%2Fgcc.git

ada: Only record types with discriminants can be unconstrained

Remove redundant condition for detecting unconstrained record types.

Code cleanup; behavior is unaffected.

gcc/ada/

	* sem_prag.adb (Is_Unconstrained_Or_Tagged_Item): Remove call
	to Has_Discriminants; combine ELSIF branches.
---

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index e57f42d9a54..02aad4d1caa 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -32971,13 +32971,10 @@ package body Sem_Prag is
       if Is_Tagged_Type (Typ) then
          return True;
 
-      elsif Is_Array_Type (Typ) then
-         return not Is_Constrained (Typ);
-
-      elsif Is_Record_Type (Typ) then
-         return Has_Discriminants (Typ) and then not Is_Constrained (Typ);
-
-      elsif Is_Private_Type (Typ) then
+      elsif Is_Array_Type (Typ)
+        or else Is_Record_Type (Typ)
+        or else Is_Private_Type (Typ)
+      then
          return not Is_Constrained (Typ);
 
       else