[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

gcc/ada/ChangeLog

+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.
+
 2014-10-10  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch13.adb (Analyze_Aspect_Specifications, Library_Unit_Aspects):

gcc/ada/gnat1drv.adb

@@ -585,7 +585,12 @@ procedure Gnat1drv is
 
       --  Treat -gnatn as equivalent to -gnatN for non-GCC targets
 
-      if Inline_Active and then not Front_End_Inlining then
+      if Inline_Active and not Front_End_Inlining then
+
+         --  We really should have a tag for this, what if we added a new
+         --  back end some day, it would not be true for this test, but it
+         --  would be non-GCC, so this is a bit troublesome ???
+
          Front_End_Inlining := VM_Target /= No_VM or else AAMP_On_Target;
       end if;
 

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

gcc/ada/sem_res.adb

@@ -6696,6 +6696,18 @@ package body Sem_Res is
          then
             return True;
 
+         --  The volatile object appears as the expression of a type conversion
+         --  occurring in a non-interfering context.
+
+         elsif Nkind_In (Context, N_Type_Conversion,
+                                  N_Unchecked_Type_Conversion)
+           and then Expression (Context) = Obj_Ref
+           and then Is_OK_Volatile_Context
+                      (Context => Parent (Context),
+                       Obj_Ref => Context)
+         then
+            return True;
+
          --  Allow references to volatile objects in various checks. This is
          --  not a direct SPARK 2014 requirement.