From 0464fc08590bf4f8cc9d011ff26b4e726134d5dd Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Tue, 7 Jun 2022 04:47:36 +0200
Subject: elab-vhdl_context: also handle generic subprograms

---
 src/synth/elab-vhdl_context.adb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/synth/elab-vhdl_context.adb b/src/synth/elab-vhdl_context.adb
index f46418a6d..95b9ddf29 100644
--- a/src/synth/elab-vhdl_context.adb
+++ b/src/synth/elab-vhdl_context.adb
@@ -513,7 +513,9 @@ package body Elab.Vhdl_Context is
 
    function Get_Instance_By_Scope
      (Syn_Inst: Synth_Instance_Acc; Scope: Sim_Info_Acc)
-     return Synth_Instance_Acc is
+     return Synth_Instance_Acc
+   is
+      pragma Assert (Scope /= null);
    begin
       case Scope.Kind is
          when Kind_Block
@@ -524,7 +526,9 @@ package body Elab.Vhdl_Context is
             begin
                Current := Syn_Inst;
                while Current /= null loop
-                  if Current.Block_Scope = Scope then
+                  if Current.Block_Scope = Scope
+                    or else Current.Uninst_Scope = Scope
+                  then
                      return Current;
                   end if;
                   Current := Current.Up_Block;
-- 
cgit v1.2.3