From: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri, 24 May 2024 07:44:10 +0000 (+0200)
Subject: ada: Fix assertion failure during analysis of instantiation of formal package
X-Git-Tag: basepoints/gcc-16~8060
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5d7daa37938984b931ae0825e9d3d72c748ab5a;p=thirdparty%2Fgcc.git

ada: Fix assertion failure during analysis of instantiation of formal package

It's an assertion on the name of an instance of a generic child unit and
it needs to cope with a renaming of the unit.

gcc/ada/

	* sem_ch12.adb (Instantiate_Formal_Package): Accept renamings of a
	generic parent that is a child unit for the abbreviated instance.
---

diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index d05c7b61194..8ace16ad008 100644
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -10996,7 +10996,8 @@ package body Sem_Ch12 is
                if Is_Child_Unit (Gen_Parent) then
                   I_Nam :=
                     New_Copy_Tree (Name (Original_Node (Analyzed_Formal)));
-                  pragma Assert (Entity (I_Nam) = Gen_Parent);
+                  pragma Assert (Entity (I_Nam) = Gen_Parent
+                    or else Renamed_Entity (Entity (I_Nam)) = Gen_Parent);
 
                else
                   I_Nam :=