diff mbox series

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

Message ID 20211202162914.GA2160110@adacore.com
State New
Headers show
Series [Ada] Do not back-annotate maximum size for limited types | expand

Commit Message

Pierre-Marie de Rodat Dec. 2, 2021, 4:29 p.m. UTC 
This prevents gigi from back-annotating a maximum size for the Esize of
limited record and concurrent types, in keeping with the implementation
of Analyze_Object_Declaration for objects of these types.

Tested on x86_64-pc-linux-gnu, committed on trunk

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 mbox series

Patch

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
--- 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;