elab-vhdl_objtypes: fix restart of libghdl

3 files changed, 25 insertions, 7 deletions

diff --git a/src/options.adb b/src/options.adb
index 9b657cbb3..00da22ca5 100644
--- a/src/options.adb
+++ b/src/options.adb
@@ -44,7 +44,7 @@ package body Options is
       Str_Table.Initialize;
       Vhdl.Lists.Initialize;
       Vhdl.Nodes.Initialize;
-      Elab.Vhdl_Objtypes.Init;
+      Elab.Vhdl_Objtypes.Initialize;
       Files_Map.Initialize;
       Libraries.Initialize;
       PSL.Nodes.Init (Libraries.Library_Location);
@@ -58,6 +58,7 @@ package body Options is
       Str_Table.Finalize;
       Vhdl.Lists.Finalize;
       Vhdl.Nodes.Finalize;
+      Elab.Vhdl_Objtypes.Finalize;
       Files_Map.Finalize;
       Libraries.Finalize;
       --  TODO: finalize errors (reset counters, handlers...)
diff --git a/src/synth/elab-vhdl_objtypes.adb b/src/synth/elab-vhdl_objtypes.adb
index ba475a723..3715e0532 100644
--- a/src/synth/elab-vhdl_objtypes.adb
+++ b/src/synth/elab-vhdl_objtypes.adb
@@ -822,9 +822,11 @@ package body Elab.Vhdl_Objtypes is
    function To_Memory_Ptr is new Ada.Unchecked_Conversion
      (Address, Memory_Ptr);
 
-   procedure Init is
+   procedure Initialize is
    begin
-      pragma Assert (Boolean_Type = null);
+      if Boolean_Type /= null then
+         Release (Empty_Marker, Global_Pool);
+      end if;
 
       Instance_Pool := Global_Pool'Access;
       Boolean_Type := Create_Bit_Type;
@@ -833,5 +835,19 @@ package body Elab.Vhdl_Objtypes is
 
       Bit0 := (Bit_Type, To_Memory_Ptr (Bit0_Mem'Address));
       Bit1 := (Bit_Type, To_Memory_Ptr (Bit1_Mem'Address));
-   end Init;
+   end Initialize;
+
+   procedure Finalize is
+   begin
+      pragma Assert (Boolean_Type /= null);
+      Release (Empty_Marker, Global_Pool);
+
+      Instance_Pool := null;
+      Boolean_Type := null;
+      Logic_Type := null;
+      Bit_Type := null;
+
+      Bit0 := Null_Memtyp;
+      Bit1 := Null_Memtyp;
+   end Finalize;
 end Elab.Vhdl_Objtypes;
diff --git a/src/synth/elab-vhdl_objtypes.ads b/src/synth/elab-vhdl_objtypes.ads
index 434fc7044..476264f37 100644
--- a/src/synth/elab-vhdl_objtypes.ads
+++ b/src/synth/elab-vhdl_objtypes.ads
@@ -298,14 +298,15 @@ package Elab.Vhdl_Objtypes is
 
    function Unshare (Src : Memtyp) return Memtyp;
 
-   procedure Init;
+   procedure Initialize;
+   procedure Finalize;
 
-   --  Set by Init.
+   --  Set by Initialize.
    Boolean_Type : Type_Acc := null;
    Logic_Type : Type_Acc := null;
    Bit_Type : Type_Acc := null;
 
-   --  Also set by init.
+   --  Also set by initialize.
    Bit0 : Memtyp;
    Bit1 : Memtyp;
 end Elab.Vhdl_Objtypes;