[multiple changes]

2012-07-17  Tristan Gingold  <gingold@adacore.com>

	* treepr.adb, treepr.ads: Revert previous patch, unneeded.

2012-07-17  Robert Dewar  <dewar@adacore.com>

	* s-assert.ads: Fix comments to make it clear that this is used
	for all assertions, not just pragma Assert.

2012-07-17  Jerome Guitton  <guitton@adacore.com>

	* par_sco.ads: Minor typo fix.

2012-07-17  Gary Dismukes  <dismukes@adacore.com>

	* layout.adb (Layout_Type): In the case where the target is
	AAMP, use 32 bits (a single pointer) rather than 64 bits for an
	anonymous access-to-subprogram type if the type is library-level
	and Is_Local_Anonymous_Access is True.

2012-07-17  Jose Ruiz  <ruiz@adacore.com>

	* s-tassta.adb, s-tarest.adb (Create_Task, Create_Restricted_Task,
	Initialize): Add comments explaining that the CPU affinity value that
	is passed to the run-time library can be either Unspecified_CPU, to
	indicate that the task inherits the affinity of its activating task,
	or a value in the range of CPU_Range but no greater than Number_Of_CPUs.

2012-07-17  Javier Miranda  <miranda@adacore.com>

	* exp_disp.adb (Make_DT): Remove decoration of Ada.Tags entities.
	(Make_Tags): Add decoration of Ada.Tags entities.

2012-07-17  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch6.adb (Check_Statement_Sequence): When locating the
	last significant statement in a sequence, ignore iserted nodes
	that typically come from expansion of controlled operations.

2012-07-17  Tristan Gingold  <gingold@adacore.com>

	* gnat_rm.texi: Document foreign exceptions.

From-SVN: r189568

11 files changed, 118 insertions, 73 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8758874..5834f6d 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,44 @@
 2012-07-17  Robert Dewar  <dewar@adacore.com>
 
+	* s-assert.ads: Fix comments to make it clear that this is used
+	for all assertions, not just pragma Assert.
+
+2012-07-17  Jerome Guitton  <guitton@adacore.com>
+
+	* par_sco.ads: Minor typo fix.
+
+2012-07-17  Gary Dismukes  <dismukes@adacore.com>
+
+	* layout.adb (Layout_Type): In the case where the target is
+	AAMP, use 32 bits (a single pointer) rather than 64 bits for an
+	anonymous access-to-subprogram type if the type is library-level
+	and Is_Local_Anonymous_Access is True.
+
+2012-07-17  Jose Ruiz  <ruiz@adacore.com>
+
+	* s-tassta.adb, s-tarest.adb (Create_Task, Create_Restricted_Task,
+	Initialize): Add comments explaining that the CPU affinity value that
+	is passed to the run-time library can be either Unspecified_CPU, to
+	indicate that the task inherits the affinity of its activating task,
+	or a value in the range of CPU_Range but no greater than Number_Of_CPUs.
+
+2012-07-17  Javier Miranda  <miranda@adacore.com>
+
+	* exp_disp.adb (Make_DT): Remove decoration of Ada.Tags entities.
+	(Make_Tags): Add decoration of Ada.Tags entities.
+
+2012-07-17  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch6.adb (Check_Statement_Sequence): When locating the
+	last significant statement in a sequence, ignore iserted nodes
+	that typically come from expansion of controlled operations.
+
+2012-07-17  Tristan Gingold  <gingold@adacore.com>
+
+	* gnat_rm.texi: Document foreign exceptions.
+
+2012-07-17  Robert Dewar  <dewar@adacore.com>
+
 	* sem_prag.adb, treepr.ads: Minor reformatting.
 
 2012-07-17  Robert Dewar  <dewar@adacore.com>
@@ -12,13 +51,6 @@
 	* seh_init.c (__gnat_SEH_error_handler): Not compiled anymore
 	on Windows 64 (+ SEH), as it is unused.
 
-2012-07-17  Tristan Gingold  <gingold@adacore.com>
-
-	* treepr.ads (psloc): Declare.
-	* treepr.adb (psloc): New debug procedure to print a sloc.
-	(Print_Sloc): New procedure, from ...
-	(Print_Node_Subtree): ... this.  Call Print_Sloc.
-
 2012-07-17  Javier Miranda  <miranda@adacore.com>
 
 	* sem_prag.adb (CPP_Class): Transform obsolescent pragma CPP_Class into
diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb
index 2dc1e48..98ecf0d 100644
--- a/gcc/ada/exp_disp.adb
+++ b/gcc/ada/exp_disp.adb
@@ -6255,12 +6255,6 @@ package body Exp_Disp is
             Elmt : Elmt_Id;
 
          begin
-            --  Ensure that entities Prim_Ptr and Predef_Prims_Table_Ptr have
-            --  the decoration required by the backend
-
-            Set_Is_Dispatch_Table_Entity (RTE (RE_Prim_Ptr));
-            Set_Is_Dispatch_Table_Entity (RTE (RE_Predef_Prims_Table_Ptr));
-
             --  Object declarations
 
             Elmt := First_Elmt (DT_Decl);
@@ -7137,6 +7131,12 @@ package body Exp_Disp is
       Set_Ekind        (DT_Ptr, E_Variable);
       Set_Related_Type (DT_Ptr, Typ);
 
+      --  Ensure that entities Prim_Ptr and Predef_Prims_Table_Ptr have
+      --  the decoration required by the backend
+
+      Set_Is_Dispatch_Table_Entity (RTE (RE_Prim_Ptr));
+      Set_Is_Dispatch_Table_Entity (RTE (RE_Predef_Prims_Table_Ptr));
+
       --  For CPP types there is no need to build the dispatch tables since
       --  they are imported from the C++ side. If the CPP type has an IP then
       --  we declare now the variable that will store the copy of the C++ tag.
diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi
index 9770f19..b047930 100644
--- a/gcc/ada/gnat_rm.texi
+++ b/gcc/ada/gnat_rm.texi
@@ -1869,8 +1869,6 @@ functions (see pragma @code{CPP_Constructor}). Such types are implicitly
 limited if not explicitly declared as limited or derived from a limited
 type, and an error is issued in that case.
 
-Pragma @code{CPP_Class} is intended primarily for automatic generation
-using an automatic binding generator tool.
 See @ref{Interfacing to C++} for related information.
 
 Note: Pragma @code{CPP_Class} is currently obsolete. It is supported
@@ -1927,7 +1925,8 @@ If no constructors are imported, it is impossible to create any objects
 on the Ada side and the type is implicitly declared abstract.
 
 Pragma @code{CPP_Constructor} is intended primarily for automatic generation
-using an automatic binding generator tool.
+using an automatic binding generator tool (such as the @code{-fdump-ada-spec}
+GCC switch).
 See @ref{Interfacing to C++} for more related information.
 
 Note: The use of functions returning class-wide types for constructors is
@@ -16617,8 +16616,7 @@ of the length corresponding to the @code{@var{type}'Size} value in Ada.
 @noindent
 The interface to C++ makes use of the following pragmas, which are
 primarily intended to be constructed automatically using a binding generator
-tool, although it is possible to construct them by hand.  No suitable binding
-generator tool is supplied with GNAT though.
+tool, although it is possible to construct them by hand.
 
 Using these pragmas it is possible to achieve complete
 inter-operability between Ada tagged types and C++ class definitions.
@@ -16640,6 +16638,11 @@ This pragma identifies an imported function (imported in the usual way
 with pragma @code{Import}) as corresponding to a C++ constructor.
 @end table
 
+In addition, C++ exceptions are propagated and can be handled in a
+@code{others} choice of an exception handler. The corresponding Ada
+occurrence has no message, and the simple name of the exception identity
+contains @samp{Foreign_Exception}.
+
 @node Interfacing to COBOL
 @section Interfacing to COBOL
 
diff --git a/gcc/ada/layout.adb b/gcc/ada/layout.adb
index 7696e59..cacc461 100644
--- a/gcc/ada/layout.adb
+++ b/gcc/ada/layout.adb
@@ -2452,15 +2452,20 @@ package body Layout is
             Init_Size (E, 2 * System_Address_Size);
 
          --  When the target is AAMP, access-to-subprogram types are fat
-         --  pointers consisting of the subprogram address and a static link
-         --  (with the exception of library-level access types, where a simple
-         --  subprogram address is used).
+         --  pointers consisting of the subprogram address and a static link,
+         --  with the exception of library-level access types (including
+         --  library-level anonymous access types, such as for components),
+         --  where a simple subprogram address is used.
 
          elsif AAMP_On_Target
            and then
-             (Ekind (E) = E_Anonymous_Access_Subprogram_Type
-               or else (Ekind (E) = E_Access_Subprogram_Type
-                         and then Present (Enclosing_Subprogram (E))))
+             ((Ekind (E) = E_Access_Subprogram_Type
+                and then Present (Enclosing_Subprogram (E)))
+                  or else
+                    (Ekind (E) = E_Anonymous_Access_Subprogram_Type
+                      and then
+                        (not Is_Local_Anonymous_Access (E)
+                          or else Present (Enclosing_Subprogram (E)))))
          then
             Init_Size (E, 2 * System_Address_Size);
 
diff --git a/gcc/ada/par_sco.ads b/gcc/ada/par_sco.ads
index 450d769..a57f5c5 100644
--- a/gcc/ada/par_sco.ads
+++ b/gcc/ada/par_sco.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2009-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 2009-2012, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -24,7 +24,7 @@
 ------------------------------------------------------------------------------
 
 --  This package contains the routines used to deal with generation and output
---  of Soure Coverage Obligations (SCO's) used for coverage analysis purposes.
+--  of Source Coverage Obligations (SCO's) used for coverage analysis purposes.
 --  See package SCOs for full documentation of format of SCO information.
 
 with Types; use Types;
diff --git a/gcc/ada/s-assert.ads b/gcc/ada/s-assert.ads
index 433e276..c19f7c1 100644
--- a/gcc/ada/s-assert.ads
+++ b/gcc/ada/s-assert.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2009, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -29,7 +29,9 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
---  This package provides support for the GNAT assert pragma
+--  This package provides support for assertions (including pragma Assert,
+--  pragma Debug, and Precondition/Postcondition/Predicate/Invariant aspects
+--  and their corresponding pragmas).
 
 --  This unit may be used directly from an application program by providing
 --  an appropriate WITH, and the interface can be expected to remain stable.
diff --git a/gcc/ada/s-tarest.adb b/gcc/ada/s-tarest.adb
index aab0ac7..9643a18 100644
--- a/gcc/ada/s-tarest.adb
+++ b/gcc/ada/s-tarest.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                  B o d y                                 --
 --                                                                          --
---         Copyright (C) 1999-2011, Free Software Foundation, Inc.          --
+--         Copyright (C) 1999-2012, Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNARL is free software; you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -483,6 +483,12 @@ package body System.Tasking.Restricted.Stages is
          then Self_ID.Common.Base_Priority
          else System.Any_Priority (Priority));
 
+      --  Legal values of CPU are the special Unspecified_CPU value which is
+      --  inserted by the compiler for tasks without CPU aspect, and those in
+      --  the range of CPU_Range but no greater than Number_Of_CPUs. Otherwise
+      --  the task is defined to have failed, and it becomes a completed task
+      --  (RM D.16(14/3)).
+
       if CPU /= Unspecified_CPU
         and then (CPU < Integer (System.Multiprocessors.CPU_Range'First)
           or else CPU > Integer (System.Multiprocessors.CPU_Range'Last)
@@ -492,6 +498,13 @@ package body System.Tasking.Restricted.Stages is
 
       --  Normal CPU affinity
       else
+         --  When the application code says nothing about the task affinity
+         --  (task without CPU aspect) then the compiler inserts the
+         --  Unspecified_CPU value which indicates to the run-time library that
+         --  the task will activate and execute on the same processor as its
+         --  activating task if the activating task is assigned a processor
+         --  (RM D.16(14/3)).
+
          Base_CPU :=
            (if CPU = Unspecified_CPU
             then Self_ID.Common.Base_CPU
diff --git a/gcc/ada/s-tassta.adb b/gcc/ada/s-tassta.adb
index 410cc8c..57c28be 100644
--- a/gcc/ada/s-tassta.adb
+++ b/gcc/ada/s-tassta.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                  B o d y                                 --
 --                                                                          --
---         Copyright (C) 1992-2011, Free Software Foundation, Inc.          --
+--         Copyright (C) 1992-2012, Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNARL is free software; you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -527,6 +527,12 @@ package body System.Tasking.Stages is
          then Self_ID.Common.Base_Priority
          else System.Any_Priority (Priority));
 
+      --  Legal values of CPU are the special Unspecified_CPU value which is
+      --  inserted by the compiler for tasks without CPU aspect, and those in
+      --  the range of CPU_Range but no greater than Number_Of_CPUs. Otherwise
+      --  the task is defined to have failed, and it becomes a completed task
+      --  (RM D.16(14/3)).
+
       if CPU /= Unspecified_CPU
         and then (CPU < Integer (System.Multiprocessors.CPU_Range'First)
                     or else
@@ -539,6 +545,13 @@ package body System.Tasking.Stages is
       --  Normal CPU affinity
 
       else
+         --  When the application code says nothing about the task affinity
+         --  (task without CPU aspect) then the compiler inserts the
+         --  Unspecified_CPU value which indicates to the run-time library that
+         --  the task will activate and execute on the same processor as its
+         --  activating task if the activating task is assigned a processor
+         --  (RM D.16(14/3)).
+
          Base_CPU :=
            (if CPU = Unspecified_CPU
             then Self_ID.Common.Base_CPU
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index e622683..b568ebb 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -6633,6 +6633,11 @@ package body Sem_Ch6 is
                 and then Exception_Junk (Last_Stm))
            or else Nkind (Last_Stm) in N_Push_xxx_Label
            or else Nkind (Last_Stm) in N_Pop_xxx_Label
+
+         --  Inserted code, such as finalization calls, is irrelevant: we only
+         --  need to check original source.
+
+           or else Is_Rewrite_Insertion (Last_Stm)
          loop
             Prev (Last_Stm);
          end loop;
diff --git a/gcc/ada/treepr.adb b/gcc/ada/treepr.adb
index 5791d3e..0f61b04 100644
--- a/gcc/ada/treepr.adb
+++ b/gcc/ada/treepr.adb
@@ -188,9 +188,6 @@ package body Treepr is
    --  level and the bars used to link list elements). In addition, for lines
    --  other than the first, an additional character Prefix_Char is output.
 
-   procedure Print_Sloc (Loc : Source_Ptr);
-   --  Print the human readable representation of Loc
-
    function Serial_Number (Id : Int) return Nat;
    --  Given a Node_Id, List_Id or Elist_Id, returns the previously assigned
    --  serial number, or zero if no serial number has yet been assigned.
@@ -890,6 +887,7 @@ package body Treepr is
       Field_To_Be_Printed : Boolean;
       Prefix_Str_Char     : String (Prefix_Str'First .. Prefix_Str'Last + 1);
 
+      Sfile : Source_File_Index;
       Fmt   : UI_Format;
 
    begin
@@ -935,7 +933,20 @@ package body Treepr is
          Print_Str (Prefix_Str_Char);
          Print_Str ("Sloc = ");
 
-         Print_Sloc (Sloc (N));
+         if Sloc (N) = Standard_Location then
+            Print_Str ("Standard_Location");
+
+         elsif Sloc (N) = Standard_ASCII_Location then
+            Print_Str ("Standard_ASCII_Location");
+
+         else
+            Sfile := Get_Source_File_Index (Sloc (N));
+            Print_Int (Int (Sloc (N)) - Int (Source_Text (Sfile)'First));
+            Write_Str ("  ");
+            Write_Location (Sloc (N));
+         end if;
+
+         Print_Eol;
       end if;
 
       --  Print Chars field if present
@@ -1386,30 +1397,6 @@ package body Treepr is
       Print_Term;
    end Print_Node_Subtree;
 
-   ----------------
-   -- Print_Sloc --
-   ----------------
-
-   procedure Print_Sloc (Loc : Source_Ptr) is
-      Sfile : Source_File_Index;
-
-   begin
-      if Loc = Standard_Location then
-         Print_Str ("Standard_Location");
-
-      elsif Loc = Standard_ASCII_Location then
-         Print_Str ("Standard_ASCII_Location");
-
-      else
-         Sfile := Get_Source_File_Index (Loc);
-         Print_Int (Int (Loc) - Int (Source_Text (Sfile)'First));
-         Write_Str ("  ");
-         Write_Location (Loc);
-      end if;
-
-      Print_Eol;
-   end Print_Sloc;
-
    ---------------
    -- Print_Str --
    ---------------
@@ -1537,16 +1524,6 @@ package body Treepr is
       Print_Node (N, Label, ' ');
    end Print_Tree_Node;
 
-   -----------
-   -- psloc --
-   -----------
-
-   procedure psloc (Loc : Source_Ptr) is
-   begin
-      Phase := Printing;
-      Print_Sloc (Loc);
-   end psloc;
-
    --------
    -- pt --
    --------
diff --git a/gcc/ada/treepr.ads b/gcc/ada/treepr.ads
index f223711..212c491 100644
--- a/gcc/ada/treepr.ads
+++ b/gcc/ada/treepr.ads
@@ -71,11 +71,6 @@ package Treepr is
    pragma Export (Ada, ppp);
    --  Same as Print_Node_Subtree
 
-   procedure psloc (Loc : Source_Ptr);
-   pragma Export (Ada, psloc);
-   --  Prints the sloc Loc
-   --  Why is this here??? use the routines in Sprint instead ???
-
    --  The following are no longer needed; you can use pp or ppp instead
 
    procedure pe (E : Elist_Id);