diff options
| author | Tristan Gingold <tgingold@free.fr> | 2018-12-04 05:44:03 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2018-12-04 05:44:03 +0100 |
| commit | bbde58854b956424cb278f20cc4d26acf8ee61b3 (patch) | |
| tree | 2154e84ffe61e00b049f4f9d1cc97ef7bc48d40f /src/vhdl | |
| parent | 4ee9742dfe7e97ecd1bc4dd8fb323591ae57b118 (diff) | |
| download | ghdl-bbde58854b956424cb278f20cc4d26acf8ee61b3.tar.gz ghdl-bbde58854b956424cb278f20cc4d26acf8ee61b3.tar.bz2 ghdl-bbde58854b956424cb278f20cc4d26acf8ee61b3.zip | |
sem_expr: use context subtype for aggregate type when possible.
Diffstat (limited to 'src/vhdl')
| -rw-r--r-- | src/vhdl/sem_expr.adb | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/src/vhdl/sem_expr.adb b/src/vhdl/sem_expr.adb index ef69e08f7..9476cca6a 100644 --- a/src/vhdl/sem_expr.adb +++ b/src/vhdl/sem_expr.adb @@ -3779,25 +3779,37 @@ package body Sem_Expr is end loop; Base_Type := Get_Base_Type (Aggr_Type); - -- FIXME: should reuse AGGR_TYPE iff AGGR_TYPE is fully constrained + -- Reuse AGGR_TYPE iff AGGR_TYPE is fully constrained -- and statically match the subtype of the aggregate. if Aggr_Constrained then - A_Subtype := Create_Array_Subtype (Base_Type, Get_Location (Aggr)); - -- FIXME: extract element subtype ? - Set_Element_Subtype (A_Subtype, Get_Element_Subtype (Aggr_Type)); - Type_Staticness := Get_Type_Staticness (A_Subtype); + Type_Staticness := Locally; for I in Infos'Range loop - Set_Nth_Element (Get_Index_Subtype_List (A_Subtype), I - 1, - Infos (I).Index_Subtype); Type_Staticness := Min (Type_Staticness, Get_Type_Staticness (Infos (I).Index_Subtype)); end loop; - Set_Type_Staticness (A_Subtype, Type_Staticness); - Set_Index_Constraint_Flag (A_Subtype, True); - -- FIXME: the element can be unconstrained. - Set_Constraint_State (A_Subtype, Fully_Constrained); - Set_Type (Aggr, A_Subtype); - Set_Literal_Subtype (Aggr, A_Subtype); + + if Get_Constraint_State (Aggr_Type) = Fully_Constrained + and then Get_Type_Staticness (Aggr_Type) = Locally + and then Type_Staticness = Locally + then + Set_Type (Aggr, Aggr_Type); + else + A_Subtype := Create_Array_Subtype (Base_Type, Get_Location (Aggr)); + -- FIXME: extract element subtype ? + Set_Element_Subtype (A_Subtype, Get_Element_Subtype (Aggr_Type)); + Type_Staticness := Min (Type_Staticness, + Get_Type_Staticness (A_Subtype)); + for I in Infos'Range loop + Set_Nth_Element (Get_Index_Subtype_List (A_Subtype), I - 1, + Infos (I).Index_Subtype); + end loop; + Set_Type_Staticness (A_Subtype, Type_Staticness); + Set_Index_Constraint_Flag (A_Subtype, True); + -- FIXME: the element can be unconstrained. + Set_Constraint_State (A_Subtype, Fully_Constrained); + Set_Type (Aggr, A_Subtype); + Set_Literal_Subtype (Aggr, A_Subtype); + end if; if Type_Staticness = Locally and then Get_Aggregate_Expand_Flag (Aggr) then -- Compute ratio of elements vs size of the aggregate to determine |