From 699b2a73d89f7471e4c0b9b0856912f8f91aa168 Mon Sep 17 00:00:00 2001 From: pmderodat Date: Mon, 3 Dec 2018 15:49:17 +0000 Subject: [PATCH] [Ada] Fix internal error on package instantiation on private type This fixes an assertion failure in gigi triggered by the instantiation of a generic package, in a visible part of another package, done on a private type whose full view is a type derived from a scalar or an access type. The problem is that the front-end creates and inserts two different freeze nodes in the expanded tree for the partial and the full views of the private subtype created by the instantiation, which is not correct: partial and full views of a given (sub)type must point to the same freeze node, if any. The patch also adds an assertion checking this property in the front-end so as to catch the inconsistency higher in the chain. 2018-12-03 Eric Botcazou gcc/ada/ * freeze.adb (Freeze_Entity): Do not freeze the partial view of a private subtype if its base type is also private with delayed freeze before the full type declaration of the base type has been seen. * sem_ch7.adb (Preserve_Full_Attributes): Add assertion on freeze node. gcc/testsuite/ * gnat.dg/generic_inst2.adb, gnat.dg/generic_inst2.ads, gnat.dg/generic_inst2_c.ads: New testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266754 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 9 ++++++++ gcc/ada/freeze.adb | 25 +++++++++++++++++++++-- gcc/ada/sem_ch7.adb | 9 ++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gnat.dg/generic_inst2.adb | 5 +++++ gcc/testsuite/gnat.dg/generic_inst2.ads | 10 +++++++++ gcc/testsuite/gnat.dg/generic_inst2_c.ads | 5 +++++ 7 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/generic_inst2.adb create mode 100644 gcc/testsuite/gnat.dg/generic_inst2.ads create mode 100644 gcc/testsuite/gnat.dg/generic_inst2_c.ads diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 481f9da53e6b..2a3ff0ff548d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2018-12-03 Eric Botcazou + + * freeze.adb (Freeze_Entity): Do not freeze the partial view of + a private subtype if its base type is also private with delayed + freeze before the full type declaration of the base type has + been seen. + * sem_ch7.adb (Preserve_Full_Attributes): Add assertion on + freeze node. + 2018-12-03 Eric Botcazou * exp_ch3.adb (Build_Record_Init_Proc): Inherit an diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index afb347969ca0..412789f56b29 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -6239,13 +6239,34 @@ package body Freeze is goto Leave; - -- Case of no full view present. If entity is derived or subtype, + -- Case of no full view present. If entity is subtype or derived, -- it is safe to freeze, correctness depends on the frozen status -- of parent. Otherwise it is either premature usage, or a Taft -- amendment type, so diagnosis is at the point of use and the -- type might be frozen later. - elsif E /= Base_Type (E) or else Is_Derived_Type (E) then + elsif E /= Base_Type (E) then + declare + Btyp : constant Entity_Id := Base_Type (E); + + begin + -- However, if the base type is itself private and has no + -- (underlying) full view either, wait until the full type + -- declaration is seen and all the full views are created. + + if Is_Private_Type (Btyp) + and then No (Full_View (Btyp)) + and then No (Underlying_Full_View (Btyp)) + and then Has_Delayed_Freeze (Btyp) + and then No (Freeze_Node (Btyp)) + then + Set_Is_Frozen (E, False); + Result := No_List; + goto Leave; + end if; + end; + + elsif Is_Derived_Type (E) then null; else diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb index 28119dfd121f..d85f847ed49f 100644 --- a/gcc/ada/sem_ch7.adb +++ b/gcc/ada/sem_ch7.adb @@ -2733,6 +2733,15 @@ package body Sem_Ch7 is Propagate_Concurrent_Flags (Priv, Base_Type (Full)); end if; + -- As explained in Freeze_Entity, private types are required to point + -- to the same freeze node as their corresponding full view, if any. + -- But we ought not to overwrite a node already inserted in the tree. + + pragma Assert (Serious_Errors_Detected /= 0 + or else No (Freeze_Node (Priv)) + or else No (Parent (Freeze_Node (Priv))) + or else Freeze_Node (Priv) = Freeze_Node (Full)); + Set_Freeze_Node (Priv, Freeze_Node (Full)); -- Propagate Default_Initial_Condition-related attributes from the diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b69ad6613168..2e63d0ad4054 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-12-03 Eric Botcazou + + * gnat.dg/generic_inst2.adb, gnat.dg/generic_inst2.ads, + gnat.dg/generic_inst2_c.ads: New testcase. + 2018-12-03 Eric Botcazou * gnat.dg/overload2.adb, gnat.dg/overload2_p.adb, diff --git a/gcc/testsuite/gnat.dg/generic_inst2.adb b/gcc/testsuite/gnat.dg/generic_inst2.adb new file mode 100644 index 000000000000..2ccebb0026f0 --- /dev/null +++ b/gcc/testsuite/gnat.dg/generic_inst2.adb @@ -0,0 +1,5 @@ +-- { dg-do compile } + +package body Generic_Inst2 is + procedure Foo (X : not null access T) is null; +end; diff --git a/gcc/testsuite/gnat.dg/generic_inst2.ads b/gcc/testsuite/gnat.dg/generic_inst2.ads new file mode 100644 index 000000000000..3124a1d3b755 --- /dev/null +++ b/gcc/testsuite/gnat.dg/generic_inst2.ads @@ -0,0 +1,10 @@ +with Generic_Inst2_C; + +package Generic_Inst2 is + type T is private; + procedure Foo (X : not null access T); + package CI is new Generic_Inst2_C (T, Foo => Foo); +private + type S is access Integer; + type T is new S; +end; diff --git a/gcc/testsuite/gnat.dg/generic_inst2_c.ads b/gcc/testsuite/gnat.dg/generic_inst2_c.ads new file mode 100644 index 000000000000..df1000be5fb2 --- /dev/null +++ b/gcc/testsuite/gnat.dg/generic_inst2_c.ads @@ -0,0 +1,5 @@ +generic + type T; + with procedure Foo (X : not null access T) is null; + with procedure Bar (X : not null access T) is null; +package Generic_Inst2_C is end; -- 2.47.2