From 46ffacc65b3f284ec7ceac9fead14b05eef80f47 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 25 Aug 2021 07:33:40 +0200 Subject: vhdl-sem_types.adb: refine conditions for resolution functions. Do not consider that functions with unbounded elements can be a resolution function. For #1844 --- src/vhdl/vhdl-sem_types.adb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/vhdl/vhdl-sem_types.adb b/src/vhdl/vhdl-sem_types.adb index 81a11e861..848cea916 100644 --- a/src/vhdl/vhdl-sem_types.adb +++ b/src/vhdl/vhdl-sem_types.adb @@ -1314,6 +1314,7 @@ package body Vhdl.Sem_Types is Decl: Iir; Decl_Type : Iir; Ret_Type : Iir; + El_Type : Iir; begin -- LRM93 2.4 -- A resolution function must be a [pure] function; @@ -1343,9 +1344,8 @@ package body Vhdl.Sem_Types is -- The type of the return value of the function must also be that of -- the signal. Ret_Type := Get_Return_Type (Func); - if Get_Base_Type (Get_Element_Subtype (Decl_Type)) - /= Get_Base_Type (Ret_Type) - then + El_Type := Get_Element_Subtype (Decl_Type); + if Get_Base_Type (El_Type) /= Get_Base_Type (Ret_Type) then return False; end if; if Atype /= Null_Iir @@ -1353,6 +1353,10 @@ package body Vhdl.Sem_Types is then return False; end if; + if not Is_Fully_Constrained_Type (El_Type) then + -- FIXME: not yet handled: unbounded element. + return False; + end if; -- LRM93 2.4 -- A resolution function must be a [pure] function; if not Flags.Flag_Relaxed_Rules and then not Get_Pure_Flag (Func) then -- cgit v1.2.3