From 663e6d7960199559ebd3107a28ea1cfda3e5be00 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sun, 21 Feb 2021 18:27:25 +0100 Subject: [PATCH] [Ada] Use more straightforward implementation for Current_Entity_In_Scope gcc/ada/ * sem_util.adb (Current_Entity_In_Scope): Reimplement. --- gcc/ada/sem_util.adb | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index c9a2c9fb2288..9b2bf86e94e2 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -6955,19 +6955,30 @@ package body Sem_Util is ----------------------------- function Current_Entity_In_Scope (N : Name_Id) return Entity_Id is - E : Entity_Id; CS : constant Entity_Id := Current_Scope; - Transient_Case : constant Boolean := Scope_Is_Transient; + E : Entity_Id; begin E := Get_Name_Entity_Id (N); - while Present (E) - and then Scope (E) /= CS - and then (not Transient_Case or else Scope (E) /= Scope (CS)) - loop - E := Homonym (E); - end loop; + + if No (E) then + null; + + elsif Scope_Is_Transient then + while Present (E) loop + exit when Scope (E) = CS or else Scope (E) = Scope (CS); + + E := Homonym (E); + end loop; + + else + while Present (E) loop + exit when Scope (E) = CS; + + E := Homonym (E); + end loop; + end if; return E; end Current_Entity_In_Scope; -- 2.47.2