vhdl: check read for attribute parameter and aggregates. Fix #2148

2 files changed, 20 insertions, 3 deletions

diff --git a/src/vhdl/vhdl-sem_expr.adb b/src/vhdl/vhdl-sem_expr.adb
index 8a7ea0d89..d4a8ef84e 100644
--- a/src/vhdl/vhdl-sem_expr.adb
+++ b/src/vhdl/vhdl-sem_expr.adb
@@ -4752,10 +4752,26 @@ package body Vhdl.Sem_Expr is
 
    procedure Check_Read_Aggregate (Aggr : Iir)
    is
-      pragma Unreferenced (Aggr);
+      Choice : Iir;
    begin
-      --  FIXME: todo.
-      null;
+      Choice := Get_Association_Choices_Chain (Aggr);
+      while Choice /= Null_Iir loop
+         case Iir_Kinds_Choice (Get_Kind (Choice)) is
+            when Iir_Kind_Choice_By_Range =>
+               --  Already checked while analyzing the range.
+               null;
+            when Iir_Kind_Choice_By_Expression =>
+               Check_Read (Get_Choice_Expression (Choice));
+            when Iir_Kind_Choice_By_Others
+              | Iir_Kind_Choice_By_Name
+              | Iir_Kind_Choice_By_None =>
+               --  Nothing to check.
+               null;
+         end case;
+         Check_Read (Get_Associated_Expr (Choice));
+
+         Choice := Get_Chain (Choice);
+      end loop;
    end Check_Read_Aggregate;
 
    --  Check EXPR can be read.
diff --git a/src/vhdl/vhdl-sem_names.adb b/src/vhdl/vhdl-sem_names.adb
index e556498c8..438945faa 100644
--- a/src/vhdl/vhdl-sem_names.adb
+++ b/src/vhdl/vhdl-sem_names.adb
@@ -1214,6 +1214,7 @@ package body Vhdl.Sem_Names is
          Set_Expr_Staticness (Attr, None);
          return;
       end if;
+      Check_Read (Parameter);
       Set_Parameter (Attr, Parameter);
       Set_Expr_Staticness (Attr, Min (Get_Type_Staticness (Prefix_Type),
                                       Get_Expr_Staticness (Parameter)));