synth: fix handling of record constraints in subtype. Fix #1961

1 files changed, 19 insertions, 4 deletions

diff --git a/src/vhdl/vhdl-annotations.adb b/src/vhdl/vhdl-annotations.adb
index 630f3ef84..9fc9788bf 100644
--- a/src/vhdl/vhdl-annotations.adb
+++ b/src/vhdl/vhdl-annotations.adb
@@ -340,8 +340,8 @@ package body Vhdl.Annotations is
             then
                --  This subtype has created a new anonymous subtype for the
                --  element.
-               Annotate_Type_Definition
-                 (Block_Info, Get_Element_Subtype (Def));
+               El := Get_Element_Subtype (Def);
+               Annotate_Type_Definition (Block_Info, El);
             end if;
             if Flag_Synthesis then
                --  For the bounds.
@@ -378,8 +378,23 @@ package body Vhdl.Annotations is
 
          when Iir_Kind_Record_Subtype_Definition =>
             if Flag_Synthesis then
-               --  For the offsets.
-               Create_Object_Info (Block_Info, Def, Kind_Type);
+               declare
+                  List : constant Iir_Flist :=
+                    Get_Elements_Declaration_List (Def);
+                  El : Iir;
+                  El_Type : Iir;
+               begin
+                  for I in Flist_First .. Flist_Last (List) loop
+                     El := Get_Nth_Element (List, I);
+                     if Get_Subtype_Indication (El) /= Null_Iir then
+                        El_Type := Get_Type (El);
+                        Annotate_Anonymous_Type_Definition
+                          (Block_Info, El_Type);
+                     end if;
+                  end loop;
+                  --  For the offsets.
+                  Create_Object_Info (Block_Info, Def, Kind_Type);
+               end;
             end if;
 
          when Iir_Kind_Access_Type_Definition =>