2014-07-31 Robert Dewar <dewar@adacore.com>

	* inline.adb, gnat1drv.adb, exp_ch6.adb, s-fileio.adb: Minor
	reformatting.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213359 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 36 insertions, 16 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 61652dc3157..0eed4a410e6 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-31  Robert Dewar  <dewar@adacore.com>
+
+	* inline.adb, gnat1drv.adb, exp_ch6.adb, s-fileio.adb: Minor
+	reformatting.
+
 2014-07-31  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/utils2.c ((build_binary_op): Don't set TREE_THIS_NOTRAP
diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index 87a4ccbfa03..a1198888fa2 100644
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -3832,9 +3832,7 @@ package body Exp_Ch6 is
 
          --  Back end inlining: let the back end handle it
 
-         if Back_End_Inlining
-           and then Is_Inlined (Subp)
-         then
+         if Back_End_Inlining and then Is_Inlined (Subp) then
             Add_Inlined_Body (Subp);
             Register_Backend_Call (Call_Node);
 
diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb
index 0f6cc4451e9..46c046c3eb5 100644
--- a/gcc/ada/gnat1drv.adb
+++ b/gcc/ada/gnat1drv.adb
@@ -594,16 +594,30 @@ procedure Gnat1drv is
          end if;
       end if;
 
-      --  No backend inlining for AAMP, VM. Turn off inlining under GNATprove
-      --  mode which would confuse formal verification output. Turn off backend
-      --  inlining if the frontend inlining is enabled.
+      --  Set back end inlining indication
 
       Back_End_Inlining :=
+
+        --  No back end inlining available for VM targets
+
         VM_Target = No_VM
-          and then not AAMP_On_Target
-          and then not GNATprove_Mode
-          and then not Front_End_Inlining
-          and then Debug_Flag_Dot_Z;
+
+        --  No back end inlining available on AAMP
+
+        and then not AAMP_On_Target
+
+        --  No back end inlining in GNATprove mode, since it just confuses
+        --  the formal verification process.
+
+        and then not GNATprove_Mode
+
+        --  No back end inlining if front end inlining explicitly enabled?
+
+        and then not Front_End_Inlining
+
+        --  For now, we only enable back end inlining if debug flag .z is set
+
+        and then Debug_Flag_Dot_Z;
 
       --  Output warning if -gnateE specified and cannot be supported
 
diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb
index b7775b4855f..758a07028d8 100644
--- a/gcc/ada/inline.adb
+++ b/gcc/ada/inline.adb
@@ -380,9 +380,7 @@ package body Inline is
                --  If the backend takes care of inlining the call then we must
                --  ensure that it has available the body of the subprogram.
 
-               elsif Level = Inline_Call
-                 and then Back_End_Inlining
-               then
+               elsif Level = Inline_Call and then Back_End_Inlining then
                   Inlined_Bodies.Increment_Last;
                   Inlined_Bodies.Table (Inlined_Bodies.Last) := Pack;
                end if;
diff --git a/gcc/ada/s-fileio.adb b/gcc/ada/s-fileio.adb
index 126427942f2..3208d233b17 100644
--- a/gcc/ada/s-fileio.adb
+++ b/gcc/ada/s-fileio.adb
@@ -980,14 +980,17 @@ package body System.File_IO is
       Encoding : CRTL.Filename_Encoding;
       --  Filename encoding specified into the form parameter
 
-      ------------------
-      --  Record_AFCB --
-      ------------------
+      -----------------
+      -- Record_AFCB --
+      -----------------
 
       procedure Record_AFCB is
       begin
          File_Ptr := AFCB_Allocate (Dummy_FCB);
 
+         --  Note that we cannot use an aggregate here as File_Ptr is a
+         --  class-wide access to a limited type (Root_Stream_Type).
+
          File_Ptr.Is_Regular_File   :=
            (is_regular_file (fileno (Stream)) /= 0);
          File_Ptr.Is_System_File    := False;
@@ -1007,6 +1010,8 @@ package body System.File_IO is
          Append_Set (File_Ptr);
       end Record_AFCB;
 
+   --  Start of processing for Open
+
    begin
       if File_Ptr /= null then
          raise Status_Error with "file already open";