From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 1 Sep 2022 14:21:07 +0000 (+0200)
Subject: [Ada] Fix immediate assertion failure with -gnatd.1
X-Git-Tag: basepoints/gcc-14~4591
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=643ae816f17745a77b62188b6bf169211609a59b;p=thirdparty%2Fgcc.git

[Ada] Fix immediate assertion failure with -gnatd.1

The switch enables the front-end unnesting pass.

gcc/ada/

	* gcc-interface/decl.cc (gnat_to_gnu_entity): Relax assertion when
	front-end unnesting is enabled.
---

diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc
index 504920d0f9af..c5a93fb3acd5 100644
--- a/gcc/ada/gcc-interface/decl.cc
+++ b/gcc/ada/gcc-interface/decl.cc
@@ -436,7 +436,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
   /* If this is a numeric or enumeral type, or an access type, a nonzero Esize
      must be specified unless it was specified by the programmer.  Exceptions
      are for access-to-protected-subprogram types and all access subtypes, as
-     another GNAT type is used to lay out the GCC type for them.  */
+     another GNAT type is used to lay out the GCC type for them, as well as
+     access-to-subprogram types if front-end unnesting is enabled.  */
   gcc_assert (!is_type
 	      || Known_Esize (gnat_entity)
 	      || Has_Size_Clause (gnat_entity)
@@ -445,6 +446,9 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
 		  && (!IN (kind, Access_Kind)
 		      || kind == E_Access_Protected_Subprogram_Type
 		      || kind == E_Anonymous_Access_Protected_Subprogram_Type
+		      || ((kind == E_Access_Subprogram_Type
+			   || kind == E_Anonymous_Access_Subprogram_Type)
+			  && Unnest_Subprogram_Mode)
 		      || kind == E_Access_Subtype
 		      || type_annotate_only)));