[multiple changes]

2015-05-26  Bob Duff  <duff@adacore.com>

	* s-rpc.ads (Partition_ID): Increase maximum Partition_ID to
	some huge number.
	* a-except-2005.adb, a-except-2005.ads, a-except.adb,
	a-except.ads, a-exexda.adb, a-exstat.adb: Minor comment fixes.

2015-05-26  Robert Dewar  <dewar@adacore.com>

	* sinfo.adb: Minor comment addition.
	* einfo.adb: Minor whitespace and punctuation fix.
	* sem_util.adb: Minor editing of comments.

From-SVN: r223673

11 files changed, 58 insertions, 60 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 124d997..457b146 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,16 @@
+2015-05-26  Bob Duff  <duff@adacore.com>
+
+	* s-rpc.ads (Partition_ID): Increase maximum Partition_ID to
+	some huge number.
+	* a-except-2005.adb, a-except-2005.ads, a-except.adb,
+	a-except.ads, a-exexda.adb, a-exstat.adb: Minor comment fixes.
+
+2015-05-26  Robert Dewar  <dewar@adacore.com>
+
+	* sinfo.adb: Minor comment addition.
+	* einfo.adb: Minor whitespace and punctuation fix.
+	* sem_util.adb: Minor editing of comments.
+
 2015-05-26  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch7.adb (Install_Private_Declarations,
diff --git a/gcc/ada/a-except-2005.adb b/gcc/ada/a-except-2005.adb
index d03194b..d203475 100644
--- a/gcc/ada/a-except-2005.adb
+++ b/gcc/ada/a-except-2005.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2015, 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,14 +29,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
---  This version of Ada.Exceptions fully supports both Ada 95 and Ada 2005.
---  It is used in all situations except for the build of the compiler and
---  other basic tools. For these latter builds, we use an Ada 95-only version.
-
---  The reason for this splitting off of a separate version is that bootstrap
---  compilers often will be used that do not support Ada 2005 features, and
---  Ada.Exceptions is part of the compiler sources.
-
 pragma Style_Checks (All_Checks);
 --  No subprogram ordering check, due to logical grouping
 
@@ -152,7 +144,7 @@ package body Ada.Exceptions is
       --
       --    Exception_Name: <exception name> (as in Exception_Name)
       --    Message: <message> (only if Exception_Message is empty)
-      --    PID=nnnn (only if != 0)
+      --    PID=nnnn (only if nonzero)
       --    Call stack traceback locations:  (only if at least one location)
       --    <0xyyyyyyyy 0xyyyyyyyy ...>      (is recorded)
       --
diff --git a/gcc/ada/a-except-2005.ads b/gcc/ada/a-except-2005.ads
index 7bf20dc..127306e 100644
--- a/gcc/ada/a-except-2005.ads
+++ b/gcc/ada/a-except-2005.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2015, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -33,12 +33,13 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
---  This version of Ada.Exceptions fully supports both Ada 95 and Ada 2005.
---  It is used in all situations except for the build of the compiler and
---  other basic tools. For these latter builds, we use an Ada 95-only version.
+--  This version of Ada.Exceptions fully supports Ada 95 and later language
+--  versions.  It is used in all situations except for the build of the
+--  compiler and other basic tools. For these latter builds, we use an
+--  Ada 95-only version.
 
---  The reason for this splitting off of a separate version is that bootstrap
---  compilers often will be used that do not support Ada 2005 features, and
+--  The reason for this splitting off of a separate version is to support
+--  older bootstrap compilers that do not support Ada 2005 features, and
 --  Ada.Exceptions is part of the compiler sources.
 
 pragma Polling (Off);
diff --git a/gcc/ada/a-except.adb b/gcc/ada/a-except.adb
index 3ffd0a1..9d5acee 100644
--- a/gcc/ada/a-except.adb
+++ b/gcc/ada/a-except.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2015, 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,17 +29,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
---  This version of Ada.Exceptions is a full Ada 95 version, and Ada 2005
---  features such as the additional definitions of Exception_Name returning
---  Wide_[Wide_]String.
-
---  It is used for building the compiler and the basic tools, since these
---  builds may be done with bootstrap compilers that cannot handle these
---  additions. The full version of Ada.Exceptions can be found in the files
---  a-except-2005.ads/adb, and is used for all other builds where full Ada
---  2005 functionality is required. In particular, it is used for building
---  run times on all targets.
-
 pragma Compiler_Unit_Warning;
 
 pragma Style_Checks (All_Checks);
@@ -130,7 +119,7 @@ package body Ada.Exceptions is
       --
       --    Exception_Name: <exception name> (as in Exception_Name)
       --    Message: <message> (only if Exception_Message is empty)
-      --    PID=nnnn (only if != 0)
+      --    PID=nnnn (only if nonzero)
       --    Call stack traceback locations:  (only if at least one location)
       --    <0xyyyyyyyy 0xyyyyyyyy ...>      (is recorded)
       --
diff --git a/gcc/ada/a-except.ads b/gcc/ada/a-except.ads
index 183bd58..bf3b74d 100644
--- a/gcc/ada/a-except.ads
+++ b/gcc/ada/a-except.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2015, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -33,17 +33,21 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
---  This version of Ada.Exceptions is a full Ada 95 version. It omits Ada 2005
---  features such as the additional definitions of Exception_Name returning
---  Wide_[Wide_]String. It differs from the Ada 95 version only in that it is
---  declared Preelaborate (see declaration below for why this is done).
-
---  It is used for building the compiler and the basic tools, since these
---  builds may be done with bootstrap compilers that cannot handle these
---  additions. The full version of Ada.Exceptions can be found in the files
+--  This version of Ada.Exceptions is used only for building the compiler
+--  and certain basic tools. The "real" version of Ada.Exceptions is in
 --  a-except-2005.ads/adb, and is used for all other builds where full Ada
---  2005 functionality is required. In particular, it is used for building
---  run times on all targets.
+--  functionality is required. In particular, it is used for building run
+--  times on all targets.
+
+--  This version is limited to Ada 95 features. It omits Ada 2005 features
+--  such as the additional definitions of Exception_Name returning
+--  Wide_[Wide_]String. It differs from the version specified in the Ada 95 RM
+--  only in that it is declared Preelaborate (see declaration below for why
+--  this is done).
+
+--  The reason for this splitting off of a separate version is to support
+--  older bootstrap compilers that do not support Ada 2005 features, and
+--  Ada.Exceptions is part of the compiler sources.
 
 pragma Compiler_Unit_Warning;
 
diff --git a/gcc/ada/a-exexda.adb b/gcc/ada/a-exexda.adb
index ec45c02..c3d1718 100644
--- a/gcc/ada/a-exexda.adb
+++ b/gcc/ada/a-exexda.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2015, 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- --
@@ -55,7 +55,7 @@ package body Exception_Data is
    --           o--
    --  (B_E_I)  |  Exception_Name: <exception name> (as in Exception_Name)
    --           |  Message: <message> (or a null line if no message)
-   --           |  PID=nnnn (if != 0)
+   --           |  PID=nnnn (if nonzero)
    --           o--
    --  (U_E_TB) |  Call stack traceback locations:
    --           |  <0xyyyyyyyy 0xyyyyyyyy ...>
@@ -284,7 +284,7 @@ package body Exception_Data is
          end if;
       end if;
 
-      --  Output PID line if non-zero
+      --  Output PID line if nonzero
 
       if X.Pid /= 0 then
          Append_Info_String (BEI_PID_Header, Info, Ptr);
diff --git a/gcc/ada/a-exstat.adb b/gcc/ada/a-exstat.adb
index cd7565f..b1c6db3 100644
--- a/gcc/ada/a-exstat.adb
+++ b/gcc/ada/a-exstat.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2015, 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- --
@@ -111,7 +111,7 @@ package body Stream_Attributes is
             "bad exception occurrence in stream input");
 
          --  The following junk raise of Program_Error is required because
-         --  this is a No_Return function, and unfortunately Raise_Exception
+         --  this is a No_Return procedure, and unfortunately Raise_Exception
          --  can return (this particular call can't, but the back end is not
          --  clever enough to know that).
 
diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb
index 285e924..dd7e232 100644
--- a/gcc/ada/einfo.adb
+++ b/gcc/ada/einfo.adb
@@ -63,7 +63,7 @@ package body Einfo is
    --    Scope                           Node3
    --    Etype                           Node5
 
-   --   Remaining fields are present only in extended nodes (i.e. entities)
+   --  Remaining fields are present only in extended nodes (i.e. entities).
 
    --  The following fields are present in all entities
 
diff --git a/gcc/ada/s-rpc.ads b/gcc/ada/s-rpc.ads
index faa09ed..2c23e5c 100644
--- a/gcc/ada/s-rpc.ads
+++ b/gcc/ada/s-rpc.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2015, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -41,10 +41,7 @@ with Ada.Streams;
 
 package System.RPC is
 
-   type Partition_ID is range 0 .. 63;
-   --  This type must not be modified without checking the code in
-   --  a-except.adb, since it expects a Partition_ID whose string
-   --  representation fits on two characters.
+   type Partition_ID is range 0 .. Integer'Last;
 
    Communication_Error : exception;
 
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 61524cc..2bf22f6 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -2120,8 +2120,8 @@ package body Sem_Util is
                then
                   return Skip;
 
-               --  For rewriten nodes we continue the traversal in the original
-               --  subtree. Needed to handle in aggregates original expressions
+               --  For rewritten nodes, continue the traversal in the original
+               --  subtree. Needed to handle aggregates in original expressions
                --  extracted from the tree by Remove_Side_Effects.
 
                elsif Is_Rewrite_Substitution (N) then
@@ -2610,9 +2610,9 @@ package body Sem_Util is
                      end if;
                   end;
 
-               --  For an array aggregate a discrete_choice_list that has a
-               --  nonstatic range, is considered as two or more separate
-               --  occurrences of the expression (RM 6.20/3)
+               --  For an array aggregate, a discrete_choice_list that has
+               --  a nonstatic range is considered as two or more separate
+               --  occurrences of the expression (RM 6.4.1(20/3)).
 
                elsif Is_Array_Type (Etype (N))
                  and then Nkind (N) = N_Aggregate
@@ -2653,10 +2653,8 @@ package body Sem_Util is
                                  end if;
                               end if;
 
-                           --  For the purposes of this check it is enough to
-                           --  consider that we cover a single component since
-                           --  since the RM rule is violated as far as I find
-                           --  more than one component.
+                           --  The RM rule is violated if there is more than
+                           --  a single choice in a component association.
 
                            else
                               Count_Components := Count_Components + 1;
diff --git a/gcc/ada/sinfo.adb b/gcc/ada/sinfo.adb
index 136195e..63a6ad5 100644
--- a/gcc/ada/sinfo.adb
+++ b/gcc/ada/sinfo.adb
@@ -57,6 +57,10 @@ package body Sinfo is
    -- Field Access Functions --
    ----------------------------
 
+   --  Note: The use of Assert (False or else ...) is just a device to allow
+   --  uniform format of the conditions following this. Note that csinfo
+   --  expects this uniform format.
+
    function ABE_Is_Certain
       (N : Node_Id) return Boolean is
    begin