1 files changed, 13 insertions, 24 deletions

diff --git a/gcc/ada/a-coorse.ads b/gcc/ada/a-coorse.ads
index f574f3c92ca..1260fba05cc 100644
--- a/gcc/ada/a-coorse.ads
+++ b/gcc/ada/a-coorse.ads
@@ -33,6 +33,7 @@
 
 with Ada.Iterator_Interfaces;
 
+with Ada.Containers.Helpers;
 private with Ada.Containers.Red_Black_Trees;
 private with Ada.Finalization;
 private with Ada.Streams;
@@ -44,6 +45,7 @@ generic
    with function "=" (Left, Right : Element_Type) return Boolean is <>;
 
 package Ada.Containers.Ordered_Sets is
+   pragma Annotate (CodePeer, Skip_Analysis);
    pragma Preelaborate;
    pragma Remote_Types;
 
@@ -283,17 +285,16 @@ package Ada.Containers.Ordered_Sets is
 
       type Key_Access is access all Key_Type;
 
+      package Impl is new Helpers.Generic_Implementation;
+
       type Reference_Control_Type is
-        new Ada.Finalization.Controlled with
+        new Impl.Reference_Control_Type with
       record
          Container : Set_Access;
          Pos       : Cursor;
          Old_Key   : Key_Access;
       end record;
 
-      overriding procedure Adjust (Control : in out Reference_Control_Type);
-      pragma Inline (Adjust);
-
       overriding procedure Finalize (Control : in out Reference_Control_Type);
       pragma Inline (Finalize);
 
@@ -344,7 +345,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;
 
@@ -380,16 +381,8 @@ private
 
    for Cursor'Read use Read;
 
-   type Reference_Control_Type is
-      new Controlled with record
-         Container : Set_Access;
-      end record;
-
-   overriding procedure Adjust (Control : in out Reference_Control_Type);
-   pragma Inline (Adjust);
-
-   overriding procedure Finalize (Control : in out Reference_Control_Type);
-   pragma Inline (Finalize);
+   subtype Reference_Control_Type is Implementation.Reference_Control_Type;
+   --  It is necessary to rename this here, so that the compiler can find it
 
    type Constant_Reference_Type
      (Element : not null access constant Element_Type) is
@@ -425,19 +418,14 @@ private
    --  container, and increments the Lock. Finalization of this object will
    --  decrement the Lock.
 
-   type Element_Access is access all Element_Type;
+   type Element_Access is access all Element_Type with
+     Storage_Size => 0;
 
    function Get_Element_Access
      (Position : Cursor) return not null Element_Access;
    --  Returns a pointer to the element designated by Position.
 
-   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 => <>);
 
    No_Element : constant Cursor := Cursor'(null, null);
 
@@ -446,7 +434,8 @@ private
    record
       Container : Set_Access;
       Node      : Node_Access;
-   end record;
+   end record
+     with Disable_Controlled => not T_Check;
 
    overriding procedure Finalize (Object : in out Iterator);