diff mbox series

[COMMITTED,24/30] ada: Fix assertion failure during analysis of instantiation of formal package

Message ID 20240620085321.2412421-24-poulhies@adacore.com
State New
Headers show
Series [COMMITTED,01/30] ada: Fix list of attributes defined by Ada 2022 | expand

Commit Message

Marc Poulhiès June 20, 2024, 8:53 a.m. UTC 
From: Eric Botcazou <ebotcazou@adacore.com>

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.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/sem_ch12.adb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

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 :=