public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-1451] [Ada] Add more initialization of Stored_Constraint
@ 2021-06-15 10:20 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2021-06-15 10:20 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:44d27e8e735855216d21d6fca80473f56a69b698
commit r12-1451-g44d27e8e735855216d21d6fca80473f56a69b698
Author: Richard Kenner <kenner@adacore.com>
Date: Sun Feb 14 08:02:19 2021 -0500
[Ada] Add more initialization of Stored_Constraint
gcc/ada/
* sem_ch3.adb (Array_Type_Declaration, Build_Derived_Type):
Reinitialize Stored_Constraint when needed.
(Set_Modular_Size): Likewise.
* atree.adb: (Check_Vanishing_Fields): Add node id to debugging
information.
Diff:
---
gcc/ada/atree.adb | 6 ++++--
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 541655c466f..d0b06bbce5e 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 f67c40ed466..1eac9057c41 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);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-15 10:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-15 10:20 [gcc r12-1451] [Ada] Add more initialization of Stored_Constraint Pierre-Marie de Rodat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).