From b618441a25a5ab963f26a8415eb43c87cfcf6505 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek <trojanek@adacore.com> Date: Tue, 26 Sep 2023 00:17:12 +0200 Subject: [PATCH] ada: Fix handling of actual subtypes for expanded names gcc/ada/ * sem_util.adb (Get_Actual_Subtype,Get_Actual_Subtype_If_Available): Fix handling of expanded names. --- gcc/ada/sem_util.adb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 5440c6ae0aae..da531e53466c 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -10104,7 +10104,7 @@ package body Sem_Util is -- formal, or a variable or constant object, then we get the actual -- subtype from the referenced entity if one has been built. - if Nkind (N) = N_Identifier + if Nkind (N) in N_Identifier | N_Expanded_Name and then (Is_Formal (Entity (N)) or else Ekind (Entity (N)) = E_Constant @@ -10225,7 +10225,7 @@ package body Sem_Util is -- formal, or a variable or constant object, then we get the actual -- subtype from the referenced entity if one has been built. - if Nkind (N) = N_Identifier + if Nkind (N) in N_Identifier | N_Expanded_Name and then (Is_Formal (Entity (N)) or else Ekind (Entity (N)) = E_Constant -- GitLab