From 958d4df37af5dc54f0e9156cbdcc367666538067 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 7 Nov 2018 02:38:31 +0100 Subject: Forward type of expression in qualified expression. Fix a regression. --- src/vhdl/iirs.ads | 4 ++-- src/vhdl/nodes_meta.adb | 2 +- src/vhdl/sem_expr.adb | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/vhdl/iirs.ads b/src/vhdl/iirs.ads index b88b35217..4057b6fc0 100644 --- a/src/vhdl/iirs.ads +++ b/src/vhdl/iirs.ads @@ -3559,12 +3559,12 @@ package Iirs is -- type_mark ' ( expression ) -- | type_mark ' aggregate -- - -- Get/Set_Type (Field1) - -- -- Get/Set_Type_Mark (Field4) -- -- Get/Set_Expression (Field5) -- + -- Get/Set_Type (Field1) + -- -- Get/Set_Expr_Staticness (State1) -- Iir_Kind_Type_Conversion (Short) diff --git a/src/vhdl/nodes_meta.adb b/src/vhdl/nodes_meta.adb index a27da707c..b7a3a7789 100644 --- a/src/vhdl/nodes_meta.adb +++ b/src/vhdl/nodes_meta.adb @@ -3617,9 +3617,9 @@ package body Nodes_Meta is Field_Type, -- Iir_Kind_Qualified_Expression Field_Expr_Staticness, - Field_Type, Field_Type_Mark, Field_Expression, + Field_Type, -- Iir_Kind_Type_Conversion Field_Expr_Staticness, Field_Type, diff --git a/src/vhdl/sem_expr.adb b/src/vhdl/sem_expr.adb index a33212839..707b65f68 100644 --- a/src/vhdl/sem_expr.adb +++ b/src/vhdl/sem_expr.adb @@ -4078,6 +4078,19 @@ package body Sem_Expr is -- static expression with a non-locally static subtype. Set_Expr_Staticness (Expr, Min (Get_Expr_Staticness (Res), Get_Type_Staticness (N_Type))); + + -- When possible, use the type of the expression as the type of the + -- qualified expression. + -- TODO: also handle unbounded subtypes, but only if this is a proper + -- subtype. + case Get_Kind (N_Type) is + when Iir_Kind_Array_Type_Definition + | Iir_Kind_Record_Type_Definition => + Set_Type (Expr, Get_Type (Res)); + when others => + null; + end case; + return Expr; end Sem_Qualified_Expression; -- cgit v1.2.3