aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYannick Moy <moy@adacore.com>2018-05-23 10:22:57 +0000
committerPierre-Marie de Rodat <pmderodat@gcc.gnu.org>2018-05-23 10:22:57 +0000
commitfd82aeff6d4338a3b9f280e423ec5236ae0fc510 (patch)
tree7df551a20e22c903fcc6661d862c10f0ff0b822b
parent0c9849e18b134711873df3bccd93d6b6faa93c6f (diff)
downloadgcc-fd82aeff6d4338a3b9f280e423ec5236ae0fc510.zip
gcc-fd82aeff6d4338a3b9f280e423ec5236ae0fc510.tar.gz
gcc-fd82aeff6d4338a3b9f280e423ec5236ae0fc510.tar.bz2
[Ada] Fix implementation of utility for finding enclosing declaration
This utility is used in GNATprove to find when a node is inside a named number declaration, and this case was not properly handled. Now fixed. There is no impact on compilation. 2018-05-23 Yannick Moy <moy@adacore.com> gcc/ada/ * sem_util.adb (Enclosing_Declaration): Fix the case of a named number declaration, which was not taken into account. From-SVN: r260586
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/sem_util.adb4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index f24eda6..b309616 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-23 Yannick Moy <moy@adacore.com>
+
+ * sem_util.adb (Enclosing_Declaration): Fix the case of a named number
+ declaration, which was not taken into account.
+
2018-05-23 Hristian Kirtchev <kirtchev@adacore.com>
* debug.adb: Switch -gnatd_s is now used to stop elaboration checks on
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 875b9eb..2d516ff 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -6635,7 +6635,9 @@ package body Sem_Util is
while Present (Decl)
and then not (Nkind (Decl) in N_Declaration
or else
- Nkind (Decl) in N_Later_Decl_Item)
+ Nkind (Decl) in N_Later_Decl_Item
+ or else
+ Nkind (Decl) = N_Number_Declaration)
loop
Decl := Parent (Decl);
end loop;