2016-04-14 Basile Starynkevitch <basile@starynkevitch.net>

	{{merging with even more of GCC 6, using subversion 1.9
	svn merge -r228401:229500 ^/trunk
	}}



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@234985 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 5 insertions, 9 deletions

diff --git a/gcc/ada/a-ciormu.ads b/gcc/ada/a-ciormu.ads
index 7524cf7be3c..4eab5b1dd49 100644
--- a/gcc/ada/a-ciormu.ads
+++ b/gcc/ada/a-ciormu.ads
@@ -44,6 +44,7 @@ generic
    with function "=" (Left, Right : Element_Type) return Boolean is <>;
 
 package Ada.Containers.Indefinite_Ordered_Multisets is
+   pragma Annotate (CodePeer, Skip_Analysis);
    pragma Preelaborate;
    pragma Remote_Types;
 
@@ -472,7 +473,7 @@ private
    overriding procedure Finalize (Container : in out Set) renames Clear;
 
    use Red_Black_Trees;
-   use Tree_Types;
+   use Tree_Types, Tree_Types.Implementation;
    use Ada.Finalization;
    use Ada.Streams;
 
@@ -539,20 +540,15 @@ private
 
    for Constant_Reference_Type'Write use Write;
 
-   Empty_Set : constant Set :=
-                 (Controlled with Tree => (First  => null,
-                                           Last   => null,
-                                           Root   => null,
-                                           Length => 0,
-                                           Busy   => 0,
-                                           Lock   => 0));
+   Empty_Set : constant Set := (Controlled with others => <>);
 
    type Iterator is new Limited_Controlled and
      Set_Iterator_Interfaces.Reversible_Iterator with
    record
       Container : Set_Access;
       Node      : Node_Access;
-   end record;
+   end record
+     with Disable_Controlled => not T_Check;
 
    overriding procedure Finalize (Object : in out Iterator);