* [COMMITTED] ada: Fix nested generic instantiation
@ 2023-01-05 14:40 Marc Poulhiès
0 siblings, 0 replies; only message in thread
From: Marc Poulhiès @ 2023-01-05 14:40 UTC (permalink / raw)
To: gcc-patches; +Cc: Marc Poulhiès
Previous fix for generic instantiation was not precise enough and could
wrongly assume the instantiation node to be an N_Expanded_Name.
gcc/ada/
* sem_ch12.adb (Instantiate_Package_Body): Better filtering when
installing parent on the scope stack.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/sem_ch12.adb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index 0f2dd39b53c..1755549bd8b 100644
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -12182,6 +12182,9 @@ package body Sem_Ch12 is
elsif Ekind (Scope (Gen_Unit)) = E_Generic_Package
and then Ekind (Scope (Act_Decl_Id)) = E_Package
and then Is_Generic_Instance (Scope (Act_Decl_Id))
+ and then Nkind
+ (Name (Get_Unit_Instantiation_Node
+ (Scope (Act_Decl_Id)))) = N_Expanded_Name
then
Par_Ent := Entity
(Prefix (Name (Get_Unit_Instantiation_Node
--
2.34.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-05 14:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-05 14:40 [COMMITTED] ada: Fix nested generic instantiation Marc Poulhiès
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).