diff options
| -rw-r--r-- | src/vhdl/iirs.ads | 6 | ||||
| -rw-r--r-- | src/vhdl/sem_specs.adb | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/vhdl/iirs.ads b/src/vhdl/iirs.ads index 52f8b94e2..3ea46ebc0 100644 --- a/src/vhdl/iirs.ads +++ b/src/vhdl/iirs.ads @@ -568,8 +568,10 @@ package Iirs is -- -- Get/Set_Entity_Name (Field2) -- - -- parse: a simple name. - -- sem: an architecture declaration or NULL_IIR. + -- A simple name for the architecture. The named entity can be: + -- * Null_Iir if the architecture is not known. + -- * a design unit if the architecture is known but not loaded. + -- * an architecture body if the architecture is loaded. -- Get/Set_Architecture (Field3) -- Iir_Kind_Entity_Aspect_Open (Short) diff --git a/src/vhdl/sem_specs.adb b/src/vhdl/sem_specs.adb index cb7f945f1..8d0eb03a8 100644 --- a/src/vhdl/sem_specs.adb +++ b/src/vhdl/sem_specs.adb @@ -1056,6 +1056,7 @@ package body Sem_Specs is Arch_Name : Iir; Arch_Unit : Iir; begin + -- The entity. Entity_Name := Sem_Denoting_Name (Get_Entity_Name (Aspect)); Set_Entity_Name (Aspect, Entity_Name); Entity := Get_Named_Entity (Entity_Name); @@ -1073,8 +1074,13 @@ package body Sem_Specs is if Arch_Name /= Null_Iir then Arch_Unit := Libraries.Find_Secondary_Unit (Get_Design_Unit (Entity), Get_Identifier (Arch_Name)); - Set_Named_Entity (Arch_Name, Arch_Unit); if Arch_Unit /= Null_Iir then + -- The architecture is known. + if Get_Date_State (Arch_Unit) >= Date_Parse then + -- And loaded! + Arch_Unit := Get_Library_Unit (Arch_Unit); + end if; + Set_Named_Entity (Arch_Name, Arch_Unit); Xref_Ref (Arch_Name, Arch_Unit); end if; |