aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2014-11-01 04:56:50 +0100
committerTristan Gingold <tgingold@free.fr>2014-11-01 04:56:50 +0100
commit27d00e5b4c5a1411080ac4ad9172c365b86faffd (patch)
tree9fc6f114c4dcce2365c35e775c8899afe6c394b6
parent9e22ebad3dbc1065e13ccc56dfbb3418839b1002 (diff)
downloadghdl-27d00e5b4c5a1411080ac4ad9172c365b86faffd.tar.gz
ghdl-27d00e5b4c5a1411080ac4ad9172c365b86faffd.tar.bz2
ghdl-27d00e5b4c5a1411080ac4ad9172c365b86faffd.zip
Fix vital regressions.
-rw-r--r--ieee-vital_timing.adb7
-rw-r--r--post_sems.adb2
2 files changed, 6 insertions, 3 deletions
diff --git a/ieee-vital_timing.adb b/ieee-vital_timing.adb
index 453eeaa12..d6429e251 100644
--- a/ieee-vital_timing.adb
+++ b/ieee-vital_timing.adb
@@ -196,7 +196,8 @@ package body Ieee.Vital_Timing is
Expr : Iir;
begin
if Get_Kind (Decl) /= Iir_Kind_Attribute_Specification
- or else Get_Attribute_Designator (Decl) /= Vital_Level0_Attribute
+ or else (Get_Named_Entity (Get_Attribute_Designator (Decl))
+ /= Vital_Level0_Attribute)
then
Error_Vital
("first declaration must be the VITAL attribute specification",
@@ -1315,7 +1316,9 @@ package body Ieee.Vital_Timing is
Value := Get_Attribute_Value_Chain (Unit);
while Value /= Null_Iir loop
Spec := Get_Attribute_Specification (Value);
- if Get_Attribute_Designator (Spec) = Vital_Level0_Attribute then
+ if Get_Named_Entity (Get_Attribute_Designator (Spec))
+ = Vital_Level0_Attribute
+ then
return True;
end if;
Value := Get_Chain (Value);
diff --git a/post_sems.adb b/post_sems.adb
index 151be334e..78eda5015 100644
--- a/post_sems.adb
+++ b/post_sems.adb
@@ -56,7 +56,7 @@ package body Post_Sems is
Value := Get_Attribute_Value_Chain (Lib_Unit);
while Value /= Null_Iir loop
Spec := Get_Attribute_Specification (Value);
- Attr_Decl := Get_Attribute_Designator (Spec);
+ Attr_Decl := Get_Named_Entity (Get_Attribute_Designator (Spec));
if Attr_Decl = Ieee.Vital_Timing.Vital_Level0_Attribute then
Ieee.Vital_Timing.Check_Vital_Level0 (Unit);
elsif Attr_Decl = Ieee.Vital_Timing.Vital_Level1_Attribute then