aboutsummaryrefslogtreecommitdiffstats
path: root/src/vhdl
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2021-11-15 07:55:01 +0100
committerTristan Gingold <tgingold@free.fr>2021-11-15 18:23:38 +0100
commit1a9e48e9d72bfd4c027ab2fb852f83c67ae9ce6c (patch)
treef4f91e6338d5d980fc215d04cb618491ba33cb74 /src/vhdl
parentf9e8c83cb65b9eb88e9c172dcae2b4d91534f227 (diff)
downloadghdl-1a9e48e9d72bfd4c027ab2fb852f83c67ae9ce6c.tar.gz
ghdl-1a9e48e9d72bfd4c027ab2fb852f83c67ae9ce6c.tar.bz2
ghdl-1a9e48e9d72bfd4c027ab2fb852f83c67ae9ce6c.zip
vhdl-sem_expr: improve code generation for multi-dim aggregates
Diffstat (limited to 'src/vhdl')
-rw-r--r--src/vhdl/vhdl-sem_expr.adb6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vhdl/vhdl-sem_expr.adb b/src/vhdl/vhdl-sem_expr.adb
index 79aa853e3..21e7b2237 100644
--- a/src/vhdl/vhdl-sem_expr.adb
+++ b/src/vhdl/vhdl-sem_expr.adb
@@ -3734,6 +3734,9 @@ package body Vhdl.Sem_Expr is
begin
-- Analyze choices (for aggregate but not for strings).
if Get_Kind (Aggr) = Iir_Kind_Aggregate then
+ -- By default, consider the aggregate can be statically built.
+ Set_Aggregate_Expand_Flag (Aggr, True);
+
Assoc_Chain := Get_Association_Choices_Chain (Aggr);
Sem_Choices_Range (Assoc_Chain, Index_Type, Low, High,
Get_Location (Aggr), not Constrained, False);
@@ -4102,9 +4105,6 @@ package body Vhdl.Sem_Expr is
Info, Prev_Info : Iir_Aggregate_Info;
Type_Staticness : Iir_Staticness;
begin
- -- By default, consider the aggregate can be statically built.
- Set_Aggregate_Expand_Flag (Aggr, True);
-
-- Analyze the aggregate.
Sem_Array_Aggregate_1 (Aggr, Aggr_Type, Infos, Constrained, 1);