From 4d1429b2dd3fafdb24f9cd324cfd063b13b275d8 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 10 Oct 2014 16:45:27 +0200 Subject: [multiple changes] 2014-10-10 Robert Dewar * freeze.adb, gnat1drv.adb, sem_ch13.adb: Minor reformatting and code clean up. 2014-10-10 Hristian Kirtchev * sem_res.adb (Is_OK_Volatile_Context): Allow a volatile object reference to appear as the expression of a type conversion. From-SVN: r216091 --- gcc/ada/sem_ch13.adb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gcc/ada/sem_ch13.adb') 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 -- cgit v1.1