diff mbox series

[Ada] Take full view of private type

Message ID 20220517082741.GA1089372@adacore.com
State Committed
Commit 27b2b83bd7c1a9dfdba4ef27ea120ae5e1ead0b0
Headers
Series [Ada] Take full view of private type |

Commit Message

Pierre-Marie de Rodat May 17, 2022, 8:27 a.m. UTC 
  This allows to resolve the following:

      type Rec (<>) is private;
      type Arr (<>) is private;
   private
      type Arr is array (Positive range <>) of Natural;
      type Rec (L : Natural) is record
         F1 : Integer;
         F2 : Arr (1 .. L);
      end record;

Tested on x86_64-pc-linux-gnu, committed on trunk

gcc/ada/

	* sem_ch3.adb (Analyze_Subtype_Declaration): Use underlying type
	of Indic_Typ.
	(Constrain_Array): Ditto for T.
diff mbox series

Patch

diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -5978,7 +5978,7 @@  package body Sem_Ch3 is
       if Nkind (Subtype_Indication (N)) = N_Subtype_Indication then
          declare
             Indic_Typ    : constant Entity_Id :=
-                             Etype (Subtype_Mark (Subtype_Indication (N)));
+              Underlying_Type (Etype (Subtype_Mark (Subtype_Indication (N))));
             Subt_Index   : Node_Id;
             Target_Index : Node_Id;
 
@@ -13595,6 +13595,8 @@  package body Sem_Ch3 is
          T := Designated_Type (T);
       end if;
 
+      T := Underlying_Type (T);
+
       --  If an index constraint follows a subtype mark in a subtype indication
       --  then the type or subtype denoted by the subtype mark must not already
       --  impose an index constraint. The subtype mark must denote either an