diff options
| -rw-r--r-- | gcc/ada/atree.adb | 6 | ||||
| -rw-r--r-- | gcc/ada/sem_ch3.adb | 17 |
2 files changed, 21 insertions, 2 deletions
diff --git a/gcc/ada/atree.adb b/gcc/ada/atree.adb index 541655c..d0b06bb 100644 --- a/gcc/ada/atree.adb +++ b/gcc/ada/atree.adb @@ -772,7 +772,8 @@ package body Atree is Write_Str (New_Kind'Img); Write_Str (" Nonzero field "); Write_Str (F'Img); - Write_Str (" is vanishing"); + Write_Str (" is vanishing for node "); + Write_Int (Nat (Old_N)); Write_Eol; raise Program_Error; @@ -845,7 +846,8 @@ package body Atree is Write_Str (New_Kind'Img); Write_Str (" Nonzero field "); Write_Str (F'Img); - Write_Str (" is vanishing "); + Write_Str (" is vanishing for node "); + Write_Int (Nat (Old_N)); Write_Eol; if New_Kind = E_Void or else Old_Kind = E_Void then diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index f67c40e..1eac905 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -6191,6 +6191,12 @@ package body Sem_Ch3 is if Nkind (Def) = N_Constrained_Array_Definition then + if Ekind (T) in Incomplete_Or_Private_Kind then + Reinit_Field_To_Zero (T, Stored_Constraint); + else + pragma Assert (Ekind (T) = E_Void); + end if; + -- Establish Implicit_Base as unconstrained base type Implicit_Base := Create_Itype (E_Array_Type, P, Related_Id, 'B'); @@ -9749,6 +9755,12 @@ package body Sem_Ch3 is begin -- Set common attributes + if Ekind (Derived_Type) in Incomplete_Or_Private_Kind + and then Ekind (Parent_Base) in Modular_Integer_Kind | Array_Kind + then + Reinit_Field_To_Zero (Derived_Type, Stored_Constraint); + end if; + Set_Scope (Derived_Type, Current_Scope); Set_Etype (Derived_Type, Parent_Base); Mutate_Ekind (Derived_Type, Ekind (Parent_Base)); @@ -19618,6 +19630,11 @@ package body Sem_Ch3 is -- Proceed with analysis of mod expression Analyze_And_Resolve (Mod_Expr, Any_Integer); + + if Ekind (T) in Incomplete_Or_Private_Kind then + Reinit_Field_To_Zero (T, Stored_Constraint); + end if; + Set_Etype (T, T); Mutate_Ekind (T, E_Modular_Integer_Type); Init_Alignment (T); |