diff mbox series

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

Message ID 20220912081946.GA1513177@poulhies-Precision-5550
State New, archived
Headers
Series [Ada] Fix immediate assertion failure with -gnatd.1 |

Commit Message

Marc Poulhiès Sept. 12, 2022, 8:19 a.m. UTC 
  The switch enables the front-end unnesting pass.

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

gcc/ada/

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

Patch

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