[multiple changes]

2017-04-27  Hristian Kirtchev  <kirtchev@adacore.com>

	* a-cofuse.adb, a-cfdlli.adb, a-cofuse.ads, a-cfdlli.ads, a-cofuve.adb,
	a-cofuve.ads, a-cofuma.adb, a-cofuma.ads, sem_eval.adb, a-cofuba.adb:
	Minor reformatting.

2017-04-27  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch4.adb (Analyze_Call): If the return type of a function
	is incomplete in an context in which the full view is available,
	replace the type of the call by the full view, to prevent spurious
	type errors.
	* exp_disp.adb (Check_Premature_Freezing): Disable check on an
	abstract subprogram so that compiler does not reject a parameter
	of a primitive operation of a tagged type being frozen, when
	the untagged type of that parameter cannot be frozen.

2017-04-27  Bob Duff  <duff@adacore.com>

	* sem_attr.adb (Compute_Type_Key): Don't walk
	representation items for irrelevant types, which could be in a
	different source file.

2017-04-27  Steve Baird  <baird@adacore.com>

	* exp_attr.adb (Expand_N_Attribute_Reference):
	Don't expand Image, Wide_Image, Wide_Wide_Image attributes
	for CodePeer.

From-SVN: r247305

gcc/ada/ChangeLog

+2017-04-27  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* a-cofuse.adb, a-cfdlli.adb, a-cofuse.ads, a-cfdlli.ads, a-cofuve.adb,
+	a-cofuve.ads, a-cofuma.adb, a-cofuma.ads, sem_eval.adb, a-cofuba.adb:
+	Minor reformatting.
+
+2017-04-27  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch4.adb (Analyze_Call): If the return type of a function
+	is incomplete in an context in which the full view is available,
+	replace the type of the call by the full view, to prevent spurious
+	type errors.
+	* exp_disp.adb (Check_Premature_Freezing): Disable check on an
+	abstract subprogram so that compiler does not reject a parameter
+	of a primitive operation of a tagged type being frozen, when
+	the untagged type of that parameter cannot be frozen.
+
+2017-04-27  Bob Duff  <duff@adacore.com>
+
+	* sem_attr.adb (Compute_Type_Key): Don't walk
+	representation items for irrelevant types, which could be in a
+	different source file.
+
+2017-04-27  Steve Baird  <baird@adacore.com>
+
+	* exp_attr.adb (Expand_N_Attribute_Reference):
+	Don't expand Image, Wide_Image, Wide_Wide_Image attributes
+	for CodePeer.
+
 2017-04-27  Yannick Moy  <moy@adacore.com>
 
 	* exp_unst.ads: Fix typos in comments.

gcc/ada/a-cofuba.adb

@@ -33,13 +33,13 @@ pragma Ada_2012;
 
 package body Ada.Containers.Functional_Base with SPARK_Mode => Off is
 
-   function To_Count (Idx : Extended_Index) return Count_Type
-   is (Count_Type
+   function To_Count (Idx : Extended_Index) return Count_Type is
+     (Count_Type
        (Extended_Index'Pos (Idx) -
         Extended_Index'Pos (Extended_Index'First)));
 
-   function To_Index (Position : Count_Type) return Extended_Index
-   is (Extended_Index'Val
+   function To_Index (Position : Count_Type) return Extended_Index is
+     (Extended_Index'Val
        (Position + Extended_Index'Pos (Extended_Index'First)));
    --  Conversion functions between Index_Type and Count_Type
 

gcc/ada/a-cofuma.adb

@@ -93,8 +93,8 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is
             K : constant Key_Type := Get (Left.Keys, I);
          begin
             if not Equivalent_Keys (K, New_Key)
-              and then Get (Right.Elements, Find (Right.Keys, K))
-                    /= Get (Left.Elements, I)
+              and then Get (Right.Elements, Find (Right.Keys, K)) /=
+                       Get (Left.Elements, I)
             then
                return False;
             end if;
@@ -106,7 +106,8 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is
    function Elements_Equal_Except
      (Left  : Map;
       Right : Map;
-      X, Y  : Key_Type) return Boolean
+      X     : Key_Type;
+      Y     : Key_Type) return Boolean
    is
    begin
       for I in 1 .. Length (Left.Keys) loop
@@ -115,8 +116,8 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is
          begin
             if not Equivalent_Keys (K, X)
               and then not Equivalent_Keys (K, Y)
-              and then Get (Right.Elements, Find (Right.Keys, K))
-                    /= Get (Left.Elements, I)
+              and then Get (Right.Elements, Find (Right.Keys, K)) /=
+                       Get (Left.Elements, I)
             then
                return False;
             end if;
@@ -167,6 +168,7 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is
             end if;
          end;
       end loop;
+
       return True;
    end Keys_Included;
 
@@ -191,13 +193,15 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is
             end if;
          end;
       end loop;
+
       return True;
    end Keys_Included_Except;
 
    function Keys_Included_Except
      (Left  : Map;
       Right : Map;
-      X, Y  : Key_Type) return Boolean
+      X     : Key_Type;
+      Y     : Key_Type) return Boolean
    is
    begin
       for I in 1 .. Length (Left.Keys) loop
@@ -212,6 +216,7 @@ package body Ada.Containers.Functional_Maps with SPARK_Mode => Off is
             end if;
          end;
       end loop;
+
       return True;
    end Keys_Included_Except;
 

gcc/ada/a-cofuma.ads

@@ -36,6 +36,7 @@ generic
    type Key_Type (<>) is private;
    type Element_Type (<>)  is private;
    with function Equivalent_Keys (Left, Right : Key_Type) return Boolean;
+
 package Ada.Containers.Functional_Maps with SPARK_Mode is
 
    type Map is private with
@@ -132,13 +133,14 @@ package Ada.Containers.Functional_Maps with SPARK_Mode is
      Post   =>
        Keys_Included_Except'Result =
          (for all Key of Left =>
-              (if not Equivalent_Keys (Key, New_Key)
-               then Has_Key (Right, Key)));
+           (if not Equivalent_Keys (Key, New_Key) then
+               Has_Key (Right, Key)));
 
    function Keys_Included_Except
      (Left  : Map;
       Right : Map;
-      X, Y  : Key_Type) return Boolean
+      X     : Key_Type;
+      Y     : Key_Type) return Boolean
    --  Returns True if Left contains only keys of Right and possibly X and Y
 
    with
@@ -146,8 +148,10 @@ package Ada.Containers.Functional_Maps with SPARK_Mode is
      Post   =>
        Keys_Included_Except'Result =
          (for all Key of Left =>
-              (if not Equivalent_Keys (Key, X) and not Equivalent_Keys (Key, Y)
-               then Has_Key (Right, Key)));
+           (if not Equivalent_Keys (Key, X)
+              and not Equivalent_Keys (Key, Y)
+            then
+               Has_Key (Right, Key)));
 
    function Elements_Equal_Except
      (Left    : Map;
@@ -162,13 +166,14 @@ package Ada.Containers.Functional_Maps with SPARK_Mode is
      Post   =>
        Elements_Equal_Except'Result =
          (for all Key of Left =>
-            (if not Equivalent_Keys (Key, New_Key)
-             then Get (Left, Key) = Get (Right, Key)));
+           (if not Equivalent_Keys (Key, New_Key) then
+               Get (Left, Key) = Get (Right, Key)));
 
    function Elements_Equal_Except
      (Left  : Map;
       Right : Map;
-      X, Y  : Key_Type) return Boolean
+      X     : Key_Type;
+      Y     : Key_Type) return Boolean
    --  Returns True if all the keys of Left are mapped to the same elements in
    --  Left and Right except X and Y.
 
@@ -178,8 +183,10 @@ package Ada.Containers.Functional_Maps with SPARK_Mode is
      Post   =>
        Elements_Equal_Except'Result =
          (for all Key of Left =>
-            (if not Equivalent_Keys (Key, X) and not Equivalent_Keys (Key, Y)
-             then Get (Left, Key) = Get (Right, Key)));
+           (if not Equivalent_Keys (Key, X)
+              and not Equivalent_Keys (Key, Y)
+            then
+               Get (Left, Key) = Get (Right, Key)));
 
    ----------------------------
    -- Construction Functions --
@@ -192,7 +199,7 @@ package Ada.Containers.Functional_Maps with SPARK_Mode is
      (Container : Map;
       New_Key   : Key_Type;
       New_Item  : Element_Type) return Map
-   --  Returns Container augmented with the mapping Key -> New_Item.
+   --  Returns Container augmented with the mapping Key -> New_Item
 
    with
      Global => null,
@@ -281,11 +288,15 @@ private
    is
      (Count_Type (Key) in 1 .. Key_Containers.Length (Container.Keys));
 
-   function Iter_Next (Container : Map; Key : Private_Key) return Private_Key
+   function Iter_Next
+     (Container : Map;
+      Key       : Private_Key) return Private_Key
    is
      (if Key = Private_Key'Last then 0 else Key + 1);
 
-   function Iter_Element (Container : Map; Key : Private_Key) return Key_Type
+   function Iter_Element
+     (Container : Map;
+      Key       : Private_Key) return Key_Type
    is
      (Key_Containers.Get (Container.Keys, Count_Type (Key)));
 

gcc/ada/a-cofuse.ads

@@ -34,8 +34,10 @@ private with Ada.Containers.Functional_Base;
 
 generic
    type Element_Type (<>) is private;
-   with
-     function Equivalent_Elements (Left, Right : Element_Type) return Boolean;
+   with function Equivalent_Elements
+     (Left  : Element_Type;
+      Right : Element_Type) return Boolean;
+
 package Ada.Containers.Functional_Sets with SPARK_Mode is
 
    type Set is private with
@@ -80,8 +82,8 @@ package Ada.Containers.Functional_Sets with SPARK_Mode is
      Global => null,
      Post   =>
        "="'Result =
-         ((for all Item of Left => Contains (Right, Item))
-             and (for all Item of Right => Contains (Left, Item)));
+         (for all Item of Left => Contains (Right, Item))
+           and (for all Item of Right => Contains (Left, Item));
 
    pragma Warnings (Off, "unused variable ""Item""");
    function Is_Empty (Container : Set) return Boolean with
@@ -188,8 +190,8 @@ package Ada.Containers.Functional_Sets with SPARK_Mode is
 
      Global => null,
      Pre    =>
-       Length (Left) - Num_Overlaps (Left, Right)
-         <= Count_Type'Last - Length (Right),
+       Length (Left) - Num_Overlaps (Left, Right) <=
+         Count_Type'Last - Length (Right),
      Post   =>
        Length (Union'Result) =
          Length (Left) - Num_Overlaps (Left, Right) + Length (Right)
@@ -212,7 +214,9 @@ package Ada.Containers.Functional_Sets with SPARK_Mode is
    with
      Global => null;
 
-   function Iter_Next (Container : Set; Key : Private_Key) return Private_Key
+   function Iter_Next
+     (Container : Set;
+      Key       : Private_Key) return Private_Key
    with
      Global => null,
      Pre    => Iter_Has_Element (Container, Key);
@@ -249,7 +253,9 @@ private
    is
      (Count_Type (Key) in 1 .. Containers.Length (Container.Content));
 
-   function Iter_Next (Container : Set; Key : Private_Key) return Private_Key
+   function Iter_Next
+     (Container : Set;
+      Key       : Private_Key) return Private_Key
    is
      (if Key = Private_Key'Last then 0 else Key + 1);
 

gcc/ada/a-cofuve.adb

@@ -62,11 +62,13 @@ package body Ada.Containers.Functional_Vectors with SPARK_Mode => Off is
    -- Add --
    ---------
 
-   function Add (Container : Sequence; New_Item : Element_Type) return Sequence
+   function Add
+     (Container : Sequence;
+      New_Item  : Element_Type) return Sequence
    is
-     (Content => Add (Container.Content,
-                      Index_Type'Val
-                        (Index_Type'Pos (Index_Type'First) +
+     (Content =>
+       Add (Container.Content,
+            Index_Type'Val (Index_Type'Pos (Index_Type'First) +
                             Length (Container.Content)),
             New_Item));
 
@@ -92,6 +94,7 @@ package body Ada.Containers.Functional_Vectors with SPARK_Mode => Off is
             return False;
          end if;
       end loop;
+
       return True;
    end Constant_Range;
 
@@ -111,6 +114,7 @@ package body Ada.Containers.Functional_Vectors with SPARK_Mode => Off is
             return True;
          end if;
       end loop;
+
       return False;
    end Contains;
 
@@ -142,7 +146,8 @@ package body Ada.Containers.Functional_Vectors with SPARK_Mode => Off is
    function Equal_Except
      (Left  : Sequence;
       Right : Sequence;
-      X, Y  : Index_Type) return Boolean
+      X     : Index_Type;
+      Y     : Index_Type) return Boolean
    is
    begin
       if Length (Left.Content) /= Length (Right.Content) then
@@ -174,8 +179,8 @@ package body Ada.Containers.Functional_Vectors with SPARK_Mode => Off is
    ----------
 
    function Last (Container : Sequence) return Extended_Index is
-     (Index_Type'Val ((Index_Type'Pos (Index_Type'First) - 1)
-                      + Length (Container)));
+     (Index_Type'Val
+       ((Index_Type'Pos (Index_Type'First) - 1) + Length (Container)));
 
    ------------
    -- Length --
@@ -200,6 +205,7 @@ package body Ada.Containers.Functional_Vectors with SPARK_Mode => Off is
             return False;
          end if;
       end loop;
+
       return True;
    end Range_Equal;
 
@@ -216,8 +222,8 @@ package body Ada.Containers.Functional_Vectors with SPARK_Mode => Off is
    is
    begin
       for I in Fst .. Lst loop
-         if Get (Left, I)
-           /= Get (Right, Index_Type'Val (Index_Type'Pos (I) + Offset))
+         if Get (Left, I) /=
+              Get (Right, Index_Type'Val (Index_Type'Pos (I) + Offset))
          then
             return False;
          end if;
@@ -229,7 +235,8 @@ package body Ada.Containers.Functional_Vectors with SPARK_Mode => Off is
    -- Remove --
    ------------
 
-   function Remove (Container : Sequence;
+   function Remove
+     (Container : Sequence;
       Position : Index_Type) return Sequence
    is
      (Content => Remove (Container.Content, Position));

gcc/ada/a-cofuve.ads

@@ -38,6 +38,7 @@ generic
    --  should have at least one more element at the low end than Index_Type.
 
    type Element_Type (<>) is private;
+
 package Ada.Containers.Functional_Vectors with SPARK_Mode is
 
    subtype Extended_Index is Index_Type'Base range
@@ -86,8 +87,8 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is
      Global => null,
      Post =>
        Last'Result =
-         Index_Type'Val ((Index_Type'Pos (Index_Type'First) - 1)
-                         + Length (Container));
+         Index_Type'Val ((Index_Type'Pos (Index_Type'First) - 1) +
+           Length (Container));
    pragma Annotate (GNATprove, Inline_For_Proof, Last);
 
    function First return Extended_Index is (Index_Type'First);
@@ -134,8 +135,7 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is
      (Container : Sequence;
       Fst       : Index_Type;
       Lst       : Extended_Index;
-      Item      : Element_Type)
-         return Boolean
+      Item      : Element_Type) return Boolean
    --  Returns True if Item occurs in the range from Fst to Lst of Container
 
    with
@@ -150,8 +150,7 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is
      (Container : Sequence;
       Fst       : Index_Type;
       Lst       : Extended_Index;
-      Item      : Element_Type)
-         return Boolean
+      Item      : Element_Type) return Boolean
    --  Returns True if every element of the range from Fst to Lst of Container
    --  is equal to Item.
 
@@ -182,7 +181,8 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is
    function Equal_Except
      (Left  : Sequence;
       Right : Sequence;
-      X, Y  : Index_Type) return Boolean
+      X     : Index_Type;
+      Y     : Index_Type) return Boolean
    --  Returns True is Left and Right are the same except at positions X and Y
 
    with
@@ -192,7 +192,8 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is
        Equal_Except'Result =
          (Length (Left) = Length (Right)
            and then (for all I in Index_Type'First .. Last (Left) =>
-              (if I /= X and I /= Y then Get (Left, I) = Get (Right, I))));
+                      (if I /= X and I /= Y then
+                          Get (Left, I) = Get (Right, I))));
    pragma Annotate (GNATprove, Inline_For_Proof, Equal_Except);
 
    function Range_Equal
@@ -222,21 +223,23 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is
 
    with
      Global => null,
-     Pre    => Lst <= Last (Left)
+     Pre    =>
+       Lst <= Last (Left)
          and Offset in
            Index_Type'Pos (Index_Type'First) - Index_Type'Pos (Fst) ..
-                   (Index_Type'Pos (Index_Type'First) - 1)
-                  + Length (Right) - Index_Type'Pos (Lst),
+             (Index_Type'Pos (Index_Type'First) - 1) + Length (Right) -
+              Index_Type'Pos (Lst),
      Post   =>
        Range_Shifted'Result =
          ((for all I in Fst .. Lst =>
-                   Get (Left, I)
-           = Get (Right, Index_Type'Val (Index_Type'Pos (I) + Offset)))
+            Get (Left, I) =
+            Get (Right, Index_Type'Val (Index_Type'Pos (I) + Offset)))
           and
             (for all I in Index_Type'Val (Index_Type'Pos (Fst) + Offset) ..
-               Index_Type'Val (Index_Type'Pos (Lst) + Offset) =>
-                 Get (Left, Index_Type'Val (Index_Type'Pos (I) - Offset))
-             = Get (Right, I)));
+               Index_Type'Val (Index_Type'Pos (Lst) + Offset)
+             =>
+               Get (Left, Index_Type'Val (Index_Type'Pos (I) - Offset)) =
+               Get (Right, I)));
    pragma Annotate (GNATprove, Inline_For_Proof, Range_Shifted);
 
    ----------------------------
@@ -256,7 +259,8 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is
    with
      Global => null,
      Pre    => Position in Index_Type'First .. Last (Container),
-     Post   => Get (Set'Result, Position) = New_Item
+     Post   =>
+       Get (Set'Result, Position) = New_Item
          and then Equal_Except (Container, Set'Result, Position);
 
    function Add (Container : Sequence; New_Item : Element_Type) return Sequence
@@ -289,13 +293,13 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is
      Post   =>
        Length (Add'Result) = Length (Container) + 1
          and then Get (Add'Result, Position) = New_Item
-         and then
-            Range_Equal (Left  => Container,
+         and then Range_Equal
+                    (Left  => Container,
                      Right =>  Add'Result,
                      Fst   => Index_Type'First,
                      Lst   => Index_Type'Pred (Position))
-         and then
-            Range_Shifted (Left   => Container,
+         and then Range_Shifted
+                    (Left   => Container,
                      Right  => Add'Result,
                      Fst    => Position,
                      Lst    => Last (Container),
@@ -315,13 +319,13 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is
          and Position in Index_Type'First .. Last (Container),
      Post   =>
        Length (Remove'Result) = Length (Container) - 1
-         and then
-            Range_Equal (Left  => Container,
+         and then Range_Equal
+                    (Left  => Container,
                      Right => Remove'Result,
                      Fst   => Index_Type'First,
                      Lst   => Index_Type'Pred (Position))
-         and then
-            Range_Shifted (Left   => Remove'Result,
+         and then Range_Shifted
+                    (Left   => Remove'Result,
                      Right  => Container,
                      Fst    => Position,
                      Lst    => Last (Remove'Result),
@@ -339,7 +343,8 @@ package Ada.Containers.Functional_Vectors with SPARK_Mode is
       Position  : Extended_Index) return Boolean
    with
      Global => null,
-     Post   => Iter_Has_Element'Result =
+     Post   =>
+       Iter_Has_Element'Result =
          (Position in Index_Type'First .. Last (Container));
    pragma Annotate (GNATprove, Inline_For_Proof, Iter_Has_Element);
 
@@ -364,12 +369,15 @@ private
 
    function Iter_First (Container : Sequence) return Extended_Index is
      (Index_Type'First);
+
    function Iter_Next
      (Container : Sequence;
       Position  : Extended_Index) return Extended_Index
    is
-     (if Position = Extended_Index'Last then Extended_Index'First
-      else Extended_Index'Succ (Position));
+     (if Position = Extended_Index'Last then
+         Extended_Index'First
+      else
+         Extended_Index'Succ (Position));
 
    function Iter_Has_Element
      (Container : Sequence;

gcc/ada/exp_attr.adb

@@ -3598,6 +3598,14 @@ package body Exp_Attr is
       --  Image attribute is handled in separate unit Exp_Imgv
 
       when Attribute_Image =>
+
+         --  Leave attribute unexpanded in CodePeer mode: the gnat2scil
+         --  back-end knows how to handle this attribute directly.
+
+         if CodePeer_Mode then
+            return;
+         end if;
+
          Exp_Imgv.Expand_Image_Attribute (N);
 
       ---------
@@ -6995,6 +7003,14 @@ package body Exp_Attr is
       --  Wide_Image attribute is handled in separate unit Exp_Imgv
 
       when Attribute_Wide_Image =>
+
+         --  Leave attribute unexpanded in CodePeer mode: the gnat2scil
+         --  back-end knows how to handle this attribute directly.
+
+         if CodePeer_Mode then
+            return;
+         end if;
+
          Exp_Imgv.Expand_Wide_Image_Attribute (N);
 
       ---------------------
@@ -7004,6 +7020,14 @@ package body Exp_Attr is
       --  Wide_Wide_Image attribute is handled in separate unit Exp_Imgv
 
       when Attribute_Wide_Wide_Image =>
+
+         --  Leave attribute unexpanded in CodePeer mode: the gnat2scil
+         --  back-end knows how to handle this attribute directly.
+
+         if CodePeer_Mode then
+            return;
+         end if;
+
          Exp_Imgv.Expand_Wide_Wide_Image_Attribute (N);
 
       ----------------

gcc/ada/exp_disp.adb

@@ -4510,10 +4510,13 @@ package body Exp_Disp is
 
       if Building_Static_DT (Typ) then
          declare
-            Save      : constant Boolean := Freezing_Library_Level_Tagged_Type;
+            Saved_FLLTT : constant Boolean :=
+                            Freezing_Library_Level_Tagged_Type;
+
+            Formal    : Entity_Id;
+            Frnodes   : List_Id;
             Prim      : Entity_Id;
             Prim_Elmt : Elmt_Id;
-            Frnodes   : List_Id;
 
          begin
             Freezing_Library_Level_Tagged_Type := True;
@@ -4523,18 +4526,21 @@ package body Exp_Disp is
                Prim    := Node (Prim_Elmt);
                Frnodes := Freeze_Entity (Prim, Typ);
 
-               declare
-                  F : Entity_Id;
+               --  We disable this check for abstract subprograms, given that
+               --  they cannot be called directly and thus the state of their
+               --  untagged formals is of no concern. The RM is unclear in any
+               --  case concerning the need for this check, and this topic may
+               --  go back to the ARG.
 
-               begin
-                  F := First_Formal (Prim);
-                  while Present (F) loop
-                     Check_Premature_Freezing (Prim, Typ, Etype (F));
-                     Next_Formal (F);
+               if not Is_Abstract_Subprogram (Prim)  then
+                  Formal := First_Formal (Prim);
+                  while Present (Formal) loop
+                     Check_Premature_Freezing (Prim, Typ, Etype (Formal));
+                     Next_Formal (Formal);
                   end loop;
 
                   Check_Premature_Freezing (Prim, Typ, Etype (Prim));
-               end;
+               end if;
 
                if Present (Frnodes) then
                   Append_List_To (Result, Frnodes);
@@ -4543,7 +4549,7 @@ package body Exp_Disp is
                Next_Elmt (Prim_Elmt);
             end loop;
 
-            Freezing_Library_Level_Tagged_Type := Save;
+            Freezing_Library_Level_Tagged_Type := Saved_FLLTT;
          end;
       end if;
 

gcc/ada/sem_attr.adb

@@ -6310,21 +6310,28 @@ package body Sem_Attr is
                end;
             end if;
 
+            if Is_First_Subtype (T) then
+
                --  Fold in representation aspects for the type, which appear in
-            --  the same source buffer.
+               --  the same source buffer. If the representation aspects are in
+               --  a different source file, then skip them; they apply to some
+               --  other type, perhaps one we're derived from.
 
                Rep := First_Rep_Item (T);
 
                while Present (Rep) loop
                   if Comes_From_Source (Rep) then
                      Sloc_Range (Rep, P_Min, P_Max);
-                  pragma Assert (SFI = Get_Source_File_Index (P_Min));
+
+                     if SFI = Get_Source_File_Index (P_Min) then
                         pragma Assert (SFI = Get_Source_File_Index (P_Max));
                         Process_One_Declaration;
                      end if;
+                  end if;
 
                   Rep := Next_Rep_Item (Rep);
                end loop;
+            end if;
          end Compute_Type_Key;
 
       --  Start of processing for Type_Key

gcc/ada/sem_ch4.adb

@@ -1463,6 +1463,25 @@ package body Sem_Ch4 is
          --  actuals.
 
          Check_Function_Writable_Actuals (N);
+
+         --  The return type of the function may be incomplete. This can be
+         --  the case if the type is a generic formal, or a limited view. It
+         --  can also happen when the function declaration appears before the
+         --  full view of the type (which is legal in Ada 2012) and the call
+         --  appears in a different unit, in which case the incomplete view
+         --  must be replaced with the full view to prevent subsequent type
+         --  errors.
+
+         if Is_Incomplete_Type (Etype (N))
+           and then Present (Full_View (Etype (N)))
+         then
+            if Is_Entity_Name (Nam) then
+               Set_Etype (Nam, Full_View (Etype (N)));
+               Set_Etype (Entity (Nam), Full_View (Etype (N)));
+            end if;
+
+            Set_Etype (N, Full_View (Etype (N)));
+         end if;
       end if;
    end Analyze_Call;
 

gcc/ada/sem_eval.adb

@@ -636,11 +636,11 @@ package body Sem_Eval is
         and then Has_Static_Predicate (Etype (Choice))
       then
          if Is_Discrete_Type (Etype (Choice)) then
-            return Choices_Match
+            return
+              Choices_Match
                 (Expr, Static_Discrete_Predicate (Etype (Choice)));
 
-         elsif
-            Real_Or_String_Static_Predicate_Matches (Expr, Etype (Choice))
+         elsif Real_Or_String_Static_Predicate_Matches (Expr, Etype (Choice))
          then
             return Match;