[multiple changes]

2009-04-07  Robert Dewar  <dewar@adacore.com>

	* g-socket.adb: Minor reformatting.

	* g-socthi-mingw.adb: Minor reformatting

	* g-sothco.ads: Minor reformatting

	* exp_ch4.adb:
	(Expand_Concatenate_String): Complete rewrite to generate efficient code
	inline instead of relying on external library routines.

	* s-strops.ads, s-sopco5.ads, s-sopco5.adb, s-sopco4.ads, s-sopco4.adb,
	s-sopco3.ads, s-sopco3.adb, s-strops.adb: Note that this unit is now
	obsolescent

2009-04-07  Ed Schonberg  <schonberg@adacore.com>

	* sem_attr.adb:
	(Eval_Attribute): for attributes of array objects that are not strings,
	attributes are not static if nominal subtype of object is unconstrained.

2009-04-07  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch6.adb (New_Overloaded_Entity): If two implicit homonym
	operations for a type T in an instance do not override each other,
	when T is derived from a formal private type, the corresponding
	operations inherited by a type derived from T outside
	of the instance do not override each other either.

From-SVN: r145679

gcc/ada/ChangeLog

 2009-04-07  Robert Dewar  <dewar@adacore.com>
 
+	* g-socket.adb: Minor reformatting.
+
+	* g-socthi-mingw.adb: Minor reformatting
+
+	* g-sothco.ads: Minor reformatting
+
+	* exp_ch4.adb:
+	(Expand_Concatenate_String): Complete rewrite to generate efficient code
+	inline instead of relying on external library routines.
+
+	* s-strops.ads, s-sopco5.ads, s-sopco5.adb, s-sopco4.ads, s-sopco4.adb,
+	s-sopco3.ads, s-sopco3.adb, s-strops.adb: Note that this unit is now
+	obsolescent
+
+2009-04-07  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_attr.adb:
+	(Eval_Attribute): for attributes of array objects that are not strings,
+	attributes are not static if nominal subtype of object is unconstrained.
+
+2009-04-07  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch6.adb (New_Overloaded_Entity): If two implicit homonym
+	operations for a type T in an instance do not override each other,
+	when T is derived from a formal private type, the corresponding
+	operations inherited by a type derived from T outside
+	of the instance do not override each other either.
+
+2009-04-07  Robert Dewar  <dewar@adacore.com>
+
 	(Osint.Fail): Change calling sequence to have one string arg
 	(Make.Make_Failed): Same change
 	All callers are adjusted to use concatenation

gcc/ada/g-socket.adb

@@ -1830,6 +1830,7 @@ package body GNAT.Sockets is
    procedure Set (Item : in out Socket_Set_Type; Socket : Socket_Type) is
    begin
       if Item.Last = No_Socket then
+
          --  Uninitialized socket set, make sure it is properly zeroed out
 
          Reset_Socket_Set (Item.Set'Access);
@@ -1838,6 +1839,7 @@ package body GNAT.Sockets is
       elsif Item.Last < Socket then
          Item.Last := Socket;
       end if;
+
       Insert_Socket_In_Set (Item.Set'Access, C.int (Socket));
    end Set;
 

gcc/ada/g-socthi-mingw.adb

@@ -300,16 +300,16 @@ package body GNAT.Sockets.Thin is
       Last : aliased C.int;
 
    begin
-      --  Asynchronous connection failures are notified in the
-      --  exception fd set instead of the write fd set. To ensure
-      --  POSIX compatibility, copy write fd set into exception fd
-      --  set. Once select() returns, check any socket present in the
-      --  exception fd set and peek at incoming out-of-band data. If
-      --  the test is not successful, and the socket is present in
-      --  the initial write fd set, then move the socket from the
+      --  Asynchronous connection failures are notified in the exception fd set
+      --  instead of the write fd set. To ensure POSIX compatibility, copy
+      --  write fd set into exception fd set. Once select() returns, check any
+      --  socket present in the exception fd set and peek at incoming
+      --  out-of-band data. If the test is not successful, and the socket is
+      --  present in the initial write fd set, then move the socket from the
       --  exception fd set to the write fd set.
 
       if Writefds /= No_Fd_Set_Access then
+
          --  Add any socket present in write fd set into exception fd set
 
          declare

gcc/ada/g-sothco.ads

@@ -122,7 +122,7 @@ package GNAT.Sockets.Thin_Common is
       Sa_Family : Sockaddr_Length_And_Family;
       --  Address family (and address length on some platforms)
 
-      Sa_Data   : C.char_array (1 .. 14) := (others => C.nul);
+      Sa_Data : C.char_array (1 .. 14) := (others => C.nul);
       --  Family-specific data
       --  Note that some platforms require that all unused (reserved) bytes
       --  in addresses be initialized to 0 (e.g. VxWorks).
@@ -169,14 +169,15 @@ package GNAT.Sockets.Thin_Common is
       Sin_Family : Sockaddr_Length_And_Family;
       --  Address family (and address length on some platforms)
 
-      Sin_Port   : C.unsigned_short;
+      Sin_Port : C.unsigned_short;
       --  Port in network byte order
 
-      Sin_Addr   : In_Addr;
+      Sin_Addr : In_Addr;
       --  IPv4 address
 
-      Sin_Zero   : C.char_array (1 .. 8) := (others => C.nul);
+      Sin_Zero : C.char_array (1 .. 8) := (others => C.nul);
       --  Padding
+      --
       --  Note that some platforms require that all unused (reserved) bytes
       --  in addresses be initialized to 0 (e.g. VxWorks).
    end record;
@@ -272,8 +273,8 @@ package GNAT.Sockets.Thin_Common is
    --  value if it is, zero if it is not.
 
    procedure Last_Socket_In_Set
-     (Set    : access Fd_Set;
-      Last   : Int_Access);
+     (Set  : access Fd_Set;
+      Last : Int_Access);
    --  Find the largest socket in the socket set. This is needed for select().
    --  When Last_Socket_In_Set is called, parameter Last is a maximum value of
    --  the largest socket. This hint is used to avoid scanning very large

gcc/ada/s-sopco3.adb

@@ -31,6 +31,10 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
+--  NOTE: This package is obsolescent. It is no longer used by the compiler
+--  which now generates concatenation inline. It is retained only because
+--  it may be used during bootstrapping using old versions of the compiler.
+
 pragma Warnings (Off);
 pragma Compiler_Unit;
 pragma Warnings (On);

gcc/ada/s-sopco3.ads

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2007, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2008, 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- --
@@ -33,6 +33,10 @@
 
 --  This package contains the function for concatenating three strings
 
+--  NOTE: This package is obsolescent. It is no longer used by the compiler
+--  which now generates concatenation inline. It is retained only because
+--  it may be used during bootstrapping using old versions of the compiler.
+
 pragma Warnings (Off);
 pragma Compiler_Unit;
 pragma Warnings (On);

gcc/ada/s-sopco4.adb

@@ -31,6 +31,10 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
+--  NOTE: This package is obsolescent. It is no longer used by the compiler
+--  which now generates concatenation inline. It is retained only because
+--  it may be used during bootstrapping using old versions of the compiler.
+
 pragma Warnings (Off);
 pragma Compiler_Unit;
 pragma Warnings (On);

gcc/ada/s-sopco4.ads

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2007, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2008, 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- --
@@ -33,6 +33,10 @@
 
 --  This package contains the function for concatenating four strings
 
+--  NOTE: This package is obsolescent. It is no longer used by the compiler
+--  which now generates concatenation inline. It is retained only because
+--  it may be used during bootstrapping using old versions of the compiler.
+
 pragma Warnings (Off);
 pragma Compiler_Unit;
 pragma Warnings (On);

gcc/ada/s-sopco5.adb

@@ -31,6 +31,10 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
+--  NOTE: This package is obsolescent. It is no longer used by the compiler
+--  which now generates concatenation inline. It is retained only because
+--  it may be used during bootstrapping using old versions of the compiler.
+
 pragma Warnings (Off);
 pragma Compiler_Unit;
 pragma Warnings (On);

gcc/ada/s-sopco5.ads

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2007, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2008, 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- --
@@ -33,6 +33,10 @@
 
 --  This package contains the function for concatenating five strings
 
+--  NOTE: This package is obsolescent. It is no longer used by the compiler
+--  which now generates concatenation inline. It is retained only because
+--  it may be used during bootstrapping using old versions of the compiler.
+
 pragma Warnings (Off);
 pragma Compiler_Unit;
 pragma Warnings (On);

gcc/ada/s-strops.adb

@@ -31,6 +31,10 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
+--  NOTE: This package is obsolescent. It is no longer used by the compiler
+--  which now generates concatenation inline. It is retained only because
+--  it may be used during bootstrapping using old versions of the compiler.
+
 pragma Warnings (Off);
 pragma Compiler_Unit;
 pragma Warnings (On);

gcc/ada/s-strops.ads

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2007, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2008, 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- --
@@ -34,6 +34,10 @@
 --  This package contains functions for runtime operations on strings
 --  (other than runtime comparison, found in s-strcom.ads).
 
+--  NOTE: This package is obsolescent. It is no longer used by the compiler
+--  which now generates concatenation inline. It is retained only because
+--  it may be used during bootstrapping using old versions of the compiler.
+
 pragma Warnings (Off);
 pragma Compiler_Unit;
 pragma Warnings (On);

gcc/ada/sem_attr.adb

@@ -5258,7 +5258,7 @@ package body Sem_Attr is
                if Present (AS) and then Is_Constrained (AS) then
                   P_Entity := AS;
 
-               --  If we have an unconstrained type, cannot fold
+               --  If we have an unconstrained type we cannot fold
 
                else
                   Check_Expressions;
@@ -5517,6 +5517,9 @@ package body Sem_Attr is
          --  an optimization, but it falls out essentially free, so why not.
          --  Again we compute the variable Static for easy reference later
          --  (note that no array attributes are static in Ada 83).
+         --  we also need to set Static properly for subsequent legality checks
+         --  which might otherwise accept non-static constants in contexts
+         --  where they are not legal.
 
          Static := Ada_Version >= Ada_95
                      and then Statically_Denotes_Entity (P);
@@ -5526,6 +5529,16 @@ package body Sem_Attr is
 
          begin
             N := First_Index (P_Type);
+
+            --  The expression is static if the array type is constrained
+            --  by given bounds, and not by an initial expression. Constant
+            --  strings are static in any case.
+
+            if Root_Type (P_Type) /= Standard_String then
+               Static :=
+                 Static and then not Is_Constr_Subt_For_U_Nominal (P_Type);
+            end if;
+
             while Present (N) loop
                Static := Static and then Is_Static_Subtype (Etype (N));
 

gcc/ada/sem_ch6.adb

@@ -7154,20 +7154,26 @@ package body Sem_Ch6 is
                --  odd case where both are derived operations declared at the
                --  same point, both operations should be declared, and in that
                --  case we bypass the following test and proceed to the next
-               --  part (this can only occur for certain obscure cases
-               --  involving homographs in instances and can't occur for
-               --  dispatching operations ???). Note that the following
-               --  condition is less than clear. For example, it's not at all
-               --  clear why there's a test for E_Entry here. ???
+               --  part. This can only occur for certain obscure cases in
+               --  instances, when an operation on a type derived from a formal
+               --  private type does not override a homograph inherited from
+               --  the actual. In subsequent derivations of such a type, the
+               --  DT positions of these operations remain distinct, if they
+               --  have been set.
 
                if Present (Alias (S))
                  and then (No (Alias (E))
+                            or else Is_Abstract_Subprogram (S)
                             or else Comes_From_Source (E)
-                            or else Is_Dispatching_Operation (E))
-                 and then
-                   (Ekind (E) = E_Entry
-                     or else Ekind (E) /= E_Enumeration_Literal)
+                            or else
+                              (Is_Dispatching_Operation (E)
+                                and then Present (DTC_Entity (Alias (S)))
+                                and then Present (DTC_Entity (Alias (E)))
+                                and then DT_Position (Alias (S))
+                                   = DT_Position (Alias (E))))
+                 and then Ekind (E) /= E_Enumeration_Literal
                then
+
                   --  When an derived operation is overloaded it may be due to
                   --  the fact that the full view of a private extension
                   --  re-inherits. It has to be dealt with.