From 718f9549bba57d358fc9e06d18f7ca6385266df6 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sat, 2 Jul 2022 07:38:28 +0200
Subject: vhdl: avoid crash on incorrect use of attributes.

For #2116
---
 src/vhdl/vhdl-sem.adb | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'src/vhdl/vhdl-sem.adb')

diff --git a/src/vhdl/vhdl-sem.adb b/src/vhdl/vhdl-sem.adb
index 0de4c2c7d..20b5f13ad 100644
--- a/src/vhdl/vhdl-sem.adb
+++ b/src/vhdl/vhdl-sem.adb
@@ -128,6 +128,9 @@ package body Vhdl.Sem is
          Entity := Get_Library_Unit (Entity);
          Set_Named_Entity (Name, Entity);
          Xrefs.Xref_Ref (Name, Entity);
+      elsif Get_Kind (Name) not in Iir_Kinds_Denoting_Name then
+         Error_Msg_Sem (+Name, "entity name expected");
+         return Null_Iir;
       else
          --  Certainly an expanded name.  Use the standard name analysis.
          Name := Sem_Denoting_Name (Name);
@@ -3058,17 +3061,23 @@ package body Vhdl.Sem is
       Name : Iir;
       Pkg : Iir;
    begin
-      Name := Sem_Denoting_Name (Get_Uninstantiated_Package_Name (Decl));
-      Set_Uninstantiated_Package_Name (Decl, Name);
-      Pkg := Get_Named_Entity (Name);
-      if Is_Error (Pkg) then
-         null;
-      elsif Get_Kind (Pkg) /= Iir_Kind_Package_Declaration then
-         Error_Class_Match (Name, "package");
-         Pkg := Create_Error (Pkg);
-      elsif not Is_Uninstantiated_Package (Pkg) then
-         Error_Msg_Sem (+Name, "%n is not an uninstantiated package", +Pkg);
-         Pkg := Create_Error (Pkg);
+      Name := Get_Uninstantiated_Package_Name (Decl);
+      if Get_Kind (Name) not in Iir_Kinds_Denoting_Name then
+         Error_Msg_Sem (+Name, "uninstantiated package name expected");
+         Pkg := Create_Error (Name);
+      else
+         Name := Sem_Denoting_Name (Name);
+         Set_Uninstantiated_Package_Name (Decl, Name);
+         Pkg := Get_Named_Entity (Name);
+         if Is_Error (Pkg) then
+            null;
+         elsif Get_Kind (Pkg) /= Iir_Kind_Package_Declaration then
+            Error_Class_Match (Name, "package");
+            Pkg := Create_Error (Pkg);
+         elsif not Is_Uninstantiated_Package (Pkg) then
+            Error_Msg_Sem (+Name, "%n is not an uninstantiated package", +Pkg);
+            Pkg := Create_Error (Pkg);
+         end if;
       end if;
 
       Set_Uninstantiated_Package_Decl (Decl, Pkg);
-- 
cgit v1.2.3