From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 18 Nov 2021 21:47:05 +0000 (+0100)
Subject: [Ada] Do not back-annotate maximum size for limited types
X-Git-Tag: basepoints/gcc-13~2564
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31a6895f4c20a0cadfd28be8de75258ba77212f7;p=thirdparty%2Fgcc.git

[Ada] Do not back-annotate maximum size for limited types

gcc/ada/

	* gcc-interface/decl.c (gnat_to_gnu_entity): Do not back-annotate a
	maximum size for the Esize of limited record and concurrent types.
---

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index f0c17fc5eabc..93b6eb5bb452 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -4426,8 +4426,12 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
 	  tree size = TYPE_SIZE (gnu_type);
 
 	  /* If the size is self-referential, annotate the maximum value
-	     after saturating it, if need be, to avoid a No_Uint value.  */
-	  if (CONTAINS_PLACEHOLDER_P (size))
+	     after saturating it, if need be, to avoid a No_Uint value.
+	     But do not do it for cases where Analyze_Object_Declaration
+	     in Sem_Ch3 would build a default subtype for objects.  */
+	  if (CONTAINS_PLACEHOLDER_P (size)
+	      && !Is_Limited_Record (gnat_entity)
+	      && !Is_Concurrent_Type (gnat_entity))
 	    {
 	      const unsigned int align
 		= UI_To_Int (Alignment (gnat_entity)) * BITS_PER_UNIT;