aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/sem_ch13.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2015-10-26 11:12:40 +0100
committerArnaud Charlet <charlet@gcc.gnu.org>2015-10-26 11:12:40 +0100
commite96b7045d6d56a31c05bcdf387e38c0d64584ef2 (patch)
tree74efbf5686f1ccd60a2ecaee965ac294fe866253 /gcc/ada/sem_ch13.adb
parentc1fffdf1fb2ebce24620195c4add32eb90daa598 (diff)
downloadgcc-e96b7045d6d56a31c05bcdf387e38c0d64584ef2.zip
gcc-e96b7045d6d56a31c05bcdf387e38c0d64584ef2.tar.gz
gcc-e96b7045d6d56a31c05bcdf387e38c0d64584ef2.tar.bz2
[multiple changes]
2015-10-26 Gary Dismukes <dismukes@adacore.com> * a-reatim.adb, contracts.adb, contracts.ads: Minor reformatting and typo corrections. 2015-10-26 Ed Schonberg <schonberg@adacore.com> * sem_ch13.adb (Check_Aspect_At_End_Of_Declarations): Do not recheck the consistency betwen the freeze point and the end of declarations for the expression in an aspect specification, because it was done already in the analysis of the generic. Furthermore, the delayed analysis of an aspect of the instance may produce spurious errors when the generic is a child unit that references entities in the parent (which might not be in scope at the freeze point of the instance). 2015-10-26 Yannick Moy <moy@adacore.com> * sem_res.adb (Resolve_Call): Issue info message instead of warning when call cannot be inlined in GNATprove mode. 2015-10-26 Arnaud Charlet <charlet@adacore.com> * exp_ch6.adb (Build_Procedure_Form): Use _result as the name of the extra parameter, cleaner than a random temp name. * gnat1drv.adb (Gnat1drv): Code clean up. From-SVN: r229314
Diffstat (limited to 'gcc/ada/sem_ch13.adb')
-rw-r--r--gcc/ada/sem_ch13.adb12
1 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index eb44653..9f7794f 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -9103,9 +9103,19 @@ package body Sem_Ch13 is
-- Start of processing for Check_Aspect_At_End_Of_Declarations
begin
+ -- In an instance we do not perform the consistency check between freeze
+ -- point and end of declarations, because it was done already in the
+ -- analysis of the generic. Furthermore, the delayed analysis of an
+ -- aspect of the instance may produce spurious errors when the generic
+ -- is a child unit that references entities in the parent (which might
+ -- not be in scope at the freeze point of the instance).
+
+ if In_Instance then
+ return;
+
-- Case of aspects Dimension, Dimension_System and Synchronization
- if A_Id = Aspect_Synchronization then
+ elsif A_Id = Aspect_Synchronization then
return;
-- Case of stream attributes, just have to compare entities. However,