From 2c37b3af00ed9c469c6f5ead68531165a2e76112 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sat, 18 Nov 2017 07:29:40 +0100
Subject: ghdl_simul: fix crash in elaboration.

---
 src/vhdl/simulate/elaboration.adb | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/vhdl/simulate/elaboration.adb b/src/vhdl/simulate/elaboration.adb
index 136fb30bb..812688183 100644
--- a/src/vhdl/simulate/elaboration.adb
+++ b/src/vhdl/simulate/elaboration.adb
@@ -2145,20 +2145,17 @@ package body Elaboration is
       --  Gather children and reverse the list.
       declare
          Child, Prev, First : Block_Instance_Acc;
+         Info : Sim_Info_Acc;
       begin
          Child := Instance.Children;
          First := null;
          while Child /= null loop
-            declare
-               Slot : constant Instance_Slot_Type :=
-                 Get_Info (Child.Label).Inst_Slot;
-            begin
-               --  Skip processes (they have no slot).
-               if Slot /= Invalid_Instance_Slot then
-                  pragma Assert (Sub_Instances (Slot) = null);
-                  Sub_Instances (Slot) := Child;
-               end if;
-            end;
+            Info := Get_Info (Child.Label);
+            if Info.Kind = Kind_Block then
+               pragma Assert (Info.Inst_Slot /= Invalid_Instance_Slot);
+               pragma Assert (Sub_Instances (Info.Inst_Slot) = null);
+               Sub_Instances (Info.Inst_Slot) := Child;
+            end if;
 
             --  Reverse
             Prev := Child.Brother;
-- 
cgit v1.2.3