aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorYannick Moy <moy@adacore.com>2020-05-27 16:46:27 +0200
committerPierre-Marie de Rodat <derodat@adacore.com>2020-07-10 05:16:20 -0400
commitc3026d451dacabecc7ff42b5b81deaf420d758aa (patch)
treedc83577d123b42f951afab50a953dfde38342386 /gcc
parenta6ddbacd3ad9e3a34f77311dbb136d977c79e607 (diff)
downloadgcc-c3026d451dacabecc7ff42b5b81deaf420d758aa.zip
gcc-c3026d451dacabecc7ff42b5b81deaf420d758aa.tar.gz
gcc-c3026d451dacabecc7ff42b5b81deaf420d758aa.tar.bz2
[Ada] Fix detection of volatile properties in SPARK
gcc/ada/ * sem_util.adb (Has_Enabled_Property): Add handling of non-variable objects.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/sem_util.adb8
1 files changed, 8 insertions, 0 deletions
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index b70f2c8..4b4f4af 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -11537,6 +11537,14 @@ package body Sem_Util is
elsif Ekind (Item_Id) = E_Variable then
return Type_Or_Variable_Has_Enabled_Property (Item_Id);
+ -- Other objects can only inherit properties through their type. We
+ -- cannot call directly Type_Or_Variable_Has_Enabled_Property on
+ -- these as they don't have contracts attached, which is expected by
+ -- this function.
+
+ elsif Is_Object (Item_Id) then
+ return Type_Or_Variable_Has_Enabled_Property (Etype (Item_Id));
+
elsif Is_Type (Item_Id) then
return Type_Or_Variable_Has_Enabled_Property
(Item_Id => First_Subtype (Item_Id));