3 files changed, 22 insertions, 34 deletions
diff --git a/src/simul/simul-vhdl_elab.adb b/src/simul/simul-vhdl_elab.adb
index 2e7f40f7f..849553d01 100644
--- a/src/simul/simul-vhdl_elab.adb
+++ b/src/simul/simul-vhdl_elab.adb
@@ -411,27 +411,8 @@ package body Simul.Vhdl_Elab is
          when Iir_Kind_Disconnection_Specification =>
             Gather_Disconnection (Inst, Decl);
          when Iir_Kind_Variable_Declaration =>
-            pragma Assert (Get_Shared_Flag (Decl));
-            if Get_Default_Value (Decl) = Null_Node then
-               --  Elab doesn't set a value to variables with no default
-               --  value.
-               declare
-                  V : Valtyp;
-               begin
-                  V := Get_Value (Inst, Decl);
-                  pragma Assert (V.Val = null);
-                  Current_Pool := Global_Pool'Access;
-                  if V.Typ.Kind = Type_Protected then
-                     V := Synth.Vhdl_Decls.Create_Protected_Object
-                       (Inst, Decl, V.Typ);
-                  else
-                     V := Create_Value_Default (V.Typ);
-                  end if;
-                  Current_Pool := Expr_Pool'Access;
-                  Mutate_Object (Inst, Decl, V);
-               end;
-            end if;
-
+            --  Variables are always created.
+            null;
          when Iir_Kind_Constant_Declaration
            | Iir_Kind_Non_Object_Alias_Declaration
            | Iir_Kind_Attribute_Declaration
diff --git a/src/synth/elab-vhdl_decls.adb b/src/synth/elab-vhdl_decls.adb
index 33aa08560..6839ed123 100644
--- a/src/synth/elab-vhdl_decls.adb
+++ b/src/synth/elab-vhdl_decls.adb
@@ -100,13 +100,19 @@ package body Elab.Vhdl_Decls is
          --  Note: Obj_Typ is bounded.
          Init.Typ := Obj_Typ;
       else
-         if Force_Init then
-            Current_Pool := Instance_Pool;
-            Init := Create_Value_Default (Obj_Typ);
-            Current_Pool := Expr_Pool'Access;
+         --  Always create shared variables, as they might be referenced
+         --  during elaboration.
+         if (Force_Init or else Get_Shared_Flag (Decl)) then
+            if Obj_Typ.Kind /= Type_Protected then
+               Current_Pool := Instance_Pool;
+               Init := Create_Value_Default (Obj_Typ);
+               Current_Pool := Expr_Pool'Access;
+            else
+               Init := Synth.Vhdl_Decls.Create_Protected_Object
+                 (Syn_Inst, Decl, Obj_Typ);
+               Init := Unshare (Init, Instance_Pool);
+            end if;
          else
-            --  For synthesis, no need to set a value for a shared variable
-            --  (they will certainly become a memory).
             Init := (Typ => Obj_Typ, Val => null);
          end if;
       end if;
diff --git a/src/synth/synth-vhdl_decls.adb b/src/synth/synth-vhdl_decls.adb
index ed0a62ace..5c9e62f37 100644
--- a/src/synth/synth-vhdl_decls.adb
+++ b/src/synth/synth-vhdl_decls.adb
@@ -534,13 +534,14 @@ package body Synth.Vhdl_Decls is
       if Init.Typ.Kind = Type_Protected then
          Error_Msg_Synth (Syn_Inst, Decl, "protected type not supported");
          Set_Error (Syn_Inst);
-      else
-         if Init.Val = null then
-            Mark_Expr_Pool (Marker);
-            Init := Create_Value_Default (Init.Typ);
-            Init := Unshare (Init, Instance_Pool);
-            Release_Expr_Pool (Marker);
-         end if;
+         return;
+      end if;
+
+      if Init.Val = null then
+         Mark_Expr_Pool (Marker);
+         Init := Create_Value_Default (Init.Typ);
+         Init := Unshare (Init, Instance_Pool);
+         Release_Expr_Pool (Marker);
       end if;
 
       Val := Create_Var_Wire (Syn_Inst, Decl, Wire_Variable, Init);