From b2cab4a6f6457f5c2662c0219753b96cae6c0237 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 1 Feb 2023 21:10:17 +0100 Subject: translate: rework translate_object_subtype_indication. Fix #2337 --- src/synth/elab-vhdl_annotations.adb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/synth') diff --git a/src/synth/elab-vhdl_annotations.adb b/src/synth/elab-vhdl_annotations.adb index c7b8f64fb..83d19e225 100644 --- a/src/synth/elab-vhdl_annotations.adb +++ b/src/synth/elab-vhdl_annotations.adb @@ -285,7 +285,7 @@ package body Elab.Vhdl_Annotations is | Iir_Kind_Interface_Constant_Declaration | Iir_Kind_Interface_File_Declaration => -- Elaborate the subtype indication only if it not shared. - if Is_Owned_Subtype_Indication (El) then + if Has_Owned_Subtype_Indication (El) then Annotate_Type_Definition (Block_Info, Get_Subtype_Indication (El)); end if; @@ -323,14 +323,14 @@ package body Elab.Vhdl_Annotations is begin case Get_Kind (Decl) is when Iir_Kind_Interface_Signal_Declaration => - if With_Types and then Is_Owned_Subtype_Indication (Decl) then + if With_Types and then Has_Owned_Subtype_Indication (Decl) then Annotate_Type_Definition (Block_Info, Get_Type (Decl)); end if; Create_Signal_Info (Block_Info, Decl); when Iir_Kind_Interface_Variable_Declaration | Iir_Kind_Interface_Constant_Declaration | Iir_Kind_Interface_File_Declaration => - if With_Types and then Is_Owned_Subtype_Indication (Decl) then + if With_Types and then Has_Owned_Subtype_Indication (Decl) then Annotate_Type_Definition (Block_Info, Get_Type (Decl)); end if; Create_Object_Info (Block_Info, Decl); @@ -557,7 +557,7 @@ package body Elab.Vhdl_Annotations is procedure Annotate_Declaration_Type (Block_Info: Sim_Info_Acc; Decl: Iir) is begin - if Is_Owned_Subtype_Indication (Decl) then + if Has_Owned_Subtype_Indication (Decl) then -- Really annotate the subtype indication, which might be different -- from the type (for constant declarations). Annotate_Type_Definition (Block_Info, Get_Subtype_Indication (Decl)); @@ -652,7 +652,7 @@ package body Elab.Vhdl_Annotations is Annotate_Subprogram_Body (Block_Info, Decl); when Iir_Kind_Object_Alias_Declaration => - if Is_Owned_Subtype_Indication (Decl) then + if Has_Owned_Subtype_Indication (Decl) then Annotate_Type_Definition (Block_Info, Get_Type (Decl)); end if; Create_Object_Info (Block_Info, Decl); -- cgit v1.2.3