[multiple changes]

2016-10-12  Yannick Moy  <moy@adacore.com>

	* einfo.adb, einfo.ads (Partial_Refinement_Constituents): Take
	into account constituents that are themselves abstract states
	with full or partial refinement visible.
	* sem_prag.adb (Find_Encapsulating_State): Move function
	to library-level, to share between subprograms.
	(Analyze_Refined_Global_In_Decl_Part): Use
	Find_Encapsulating_State to get relevant encapsulating state.

2016-10-12  Arnaud Charlet  <charlet@adacore.com>

	* gnat1drv.adb: Fix minor typo.

From-SVN: r241052

gcc/ada/ChangeLog

 2016-10-12  Yannick Moy  <moy@adacore.com>
 
+	* einfo.adb, einfo.ads (Partial_Refinement_Constituents): Take
+	into account constituents that are themselves abstract states
+	with full or partial refinement visible.
+	* sem_prag.adb (Find_Encapsulating_State): Move function
+	to library-level, to share between subprograms.
+	(Analyze_Refined_Global_In_Decl_Part): Use
+	Find_Encapsulating_State to get relevant encapsulating state.
+
+2016-10-12  Arnaud Charlet  <charlet@adacore.com>
+
+	* gnat1drv.adb: Fix minor typo.
+
+2016-10-12  Yannick Moy  <moy@adacore.com>
+
 	* sem_prag.adb (Analyze_Refined_Depends_In_Decl_Part): Adapt checking
 	for optional refinement of abstract state with partial
 	visible refinement.

gcc/ada/einfo.adb

@@ -8407,19 +8407,79 @@ package body Einfo is
    -------------------------------------
 
    function Partial_Refinement_Constituents (Id : E) return L is
-      Constits : Elist_Id;
+      Constits : Elist_Id := No_Elist;
+
+      procedure Add_Usable_Constituents (Item : E);
+      --  Add global item Item and/or its constituents to list Constits when
+      --  they can be used in a global refinement within the current scope. The
+      --  criteria are:
+      --    1) If Item is an abstract state with full refinement visible, add
+      --       its constituents.
+      --    2) If Item is an abstract state with only partial refinement
+      --       visible, add both Item and its constituents.
+      --    3) If Item is an abstract state without a visible refinement, add
+      --       it.
+      --    4) If Id is not an abstract state, add it.
+
+      procedure Add_Usable_Constituents (List : Elist_Id);
+      --  Apply Add_Usable_Constituents to every constituent in List
+
+      -----------------------------
+      -- Add_Usable_Constituents --
+      -----------------------------
+
+      procedure Add_Usable_Constituents (Item : E) is
+      begin
+         if Ekind (Item) = E_Abstract_State then
+            if Has_Visible_Refinement (Item) then
+               Add_Usable_Constituents (Refinement_Constituents (Item));
+
+            elsif Has_Partial_Visible_Refinement (Item) then
+               Append_New_Elmt (Item, Constits);
+               Add_Usable_Constituents (Part_Of_Constituents (Item));
+
+            else
+               Append_New_Elmt (Item, Constits);
+            end if;
+
+         else
+            Append_New_Elmt (Item, Constits);
+         end if;
+      end Add_Usable_Constituents;
+
+      procedure Add_Usable_Constituents (List : Elist_Id) is
+         Constit_Elmt : Elmt_Id;
+      begin
+         if Present (List) then
+            Constit_Elmt := First_Elmt (List);
+            while Present (Constit_Elmt) loop
+               Add_Usable_Constituents (Node (Constit_Elmt));
+               Next_Elmt (Constit_Elmt);
+            end loop;
+         end if;
+      end Add_Usable_Constituents;
+
+   --  Start of processing for Partial_Refinement_Constituents
 
    begin
       --  "Refinement" is a concept applicable only to abstract states
 
       pragma Assert (Ekind (Id) = E_Abstract_State);
-      Constits := Refinement_Constituents (Id);
+
+      if Has_Visible_Refinement (Id) then
+         Constits := Refinement_Constituents (Id);
 
       --  A refinement may be partially visible when objects declared in the
       --  private part of a package are subject to a Part_Of indicator.
 
-      if No (Constits) then
-         Constits := Part_Of_Constituents (Id);
+      elsif Has_Partial_Visible_Refinement (Id) then
+         Add_Usable_Constituents (Part_Of_Constituents (Id));
+
+      --  Function should only be called when full or partial refinement is
+      --  visible.
+
+      else
+         raise Program_Error;
       end if;
 
       return Constits;

gcc/ada/einfo.ads

@@ -3793,9 +3793,11 @@ package Einfo is
 --       way this is stored is as an element of the Subprograms_For_Type field.
 
 --    Partial_Refinement_Constituents (synthesized)
---       Present in abstract state entities. Contains the constituents that
---       refine the state in its private part, in other words, all the hidden
---       states that indicate this abstract state in a Part_Of aspect/pragma.
+--       Defined in abstract state entities. Returns the constituents that
+--       refine the state in the current scope, which are allowed in a global
+--       refinement in this scope. These consist in those constituents that are
+--       abstract states with no or only partial refinement visible, and those
+--       that are not themselves abstract states.
 
 --    Partial_View_Has_Unknown_Discr (Flag280)
 --       Present in all types. Set to Indicate that the partial view of a type

gcc/ada/gnat1drv.adb

@@ -343,7 +343,7 @@ procedure Gnat1drv is
          --  of compiler warnings, but these are being turned off by default,
          --  and CodePeer generates better messages (referencing original
          --  variables) this way.
-         --  Do this only is -gnatws is set (the default with -gnatcC), so that
+         --  Do this only if -gnatws is set (the default with -gnatcC), so that
          --  if warnings are enabled, we'll get better messages from GNAT.
 
          if Warning_Mode = Suppress then