diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-10-10 16:45:27 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-10-10 16:45:27 +0200 |
| commit | 4d1429b2dd3fafdb24f9cd324cfd063b13b275d8 (patch) | |
| tree | cec57d4cae91acb9b83d5ed5f8a252fe8a2e4216 /gcc/ada/sem_ch13.adb | |
| parent | c9f95e4c252a3e5528c4da53b183c78b66258566 (diff) | |
| download | gcc-4d1429b2dd3fafdb24f9cd324cfd063b13b275d8.zip gcc-4d1429b2dd3fafdb24f9cd324cfd063b13b275d8.tar.gz gcc-4d1429b2dd3fafdb24f9cd324cfd063b13b275d8.tar.bz2 | |
[multiple changes]
2014-10-10 Robert Dewar <dewar@adacore.com>
* freeze.adb, gnat1drv.adb, sem_ch13.adb: Minor reformatting and
code clean up.
2014-10-10 Hristian Kirtchev <kirtchev@adacore.com>
* sem_res.adb (Is_OK_Volatile_Context): Allow
a volatile object reference to appear as the expression of a
type conversion.
From-SVN: r216091
Diffstat (limited to 'gcc/ada/sem_ch13.adb')
| -rw-r--r-- | gcc/ada/sem_ch13.adb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index ca11c72..2a3dc45 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -3018,14 +3018,16 @@ package body Sem_Ch13 is -- of a package declaration, the pragma needs to be inserted -- in the list of declarations for the associated package. -- There is no issue of visibility delay for these aspects. - -- Aspect is legal on a local instantiation of a library- - -- level generic unit. if A_Id in Library_Unit_Aspects and then Nkind_In (N, N_Package_Declaration, N_Generic_Package_Declaration) and then Nkind (Parent (N)) /= N_Compilation_Unit + + -- Aspect is legal on a local instantiation of a library- + -- level generic unit. + and then not Is_Generic_Instance (Defining_Entity (N)) then Error_Msg_N |