public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-4017] [Ada] Assert_Failure on derived type with inherited Default_Initial_Condition
@ 2021-10-01 6:15 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2021-10-01 6:15 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:28c49456b29e6311bd729aed5adac3af045ff739
commit r12-4017-g28c49456b29e6311bd729aed5adac3af045ff739
Author: Gary Dismukes <dismukes@adacore.com>
Date: Wed Aug 11 16:49:40 2021 -0400
[Ada] Assert_Failure on derived type with inherited Default_Initial_Condition
gcc/ada/
* exp_util.adb (Build_DIC_Procedure_Body): Remove inappropriate
Assert pragma. Remove unneeded and dead code related to derived
private types.
Diff:
---
gcc/ada/exp_util.adb | 47 +++--------------------------------------------
1 file changed, 3 insertions(+), 44 deletions(-)
diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index 7c366663dcb..4a301e20624 100644
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -2035,14 +2035,11 @@ package body Exp_Util is
Stmts => Stmts);
end if;
- -- Otherwise the "full" DIC procedure verifies the DICs of the full
- -- view, well as DICs inherited from parent types. In addition, it
- -- indirectly verifies the DICs of the partial view by calling the
- -- "partial" DIC procedure.
+ -- Otherwise, the "full" DIC procedure verifies the DICs inherited from
+ -- parent types, as well as indirectly verifying the DICs of the partial
+ -- view by calling the "partial" DIC procedure.
else
- pragma Assert (Present (Full_Typ));
-
-- Check the DIC of the partial view by calling the "partial" DIC
-- procedure, unless the partial DIC body is empty. Generate:
@@ -2056,44 +2053,6 @@ package body Exp_Util is
New_Occurrence_Of (Obj_Id, Loc))));
end if;
- -- Derived subtypes do not have a partial view
-
- if Present (Priv_Typ) then
-
- -- The processing of the "full" DIC procedure intentionally
- -- skips the partial view because a) this may result in changes of
- -- visibility and b) lead to duplicate checks. However, when the
- -- full view is the underlying full view of an untagged derived
- -- type whose parent type is private, partial DICs appear on
- -- the rep item chain of the partial view only.
-
- -- package Pack_1 is
- -- type Root ... is private;
- -- private
- -- <full view of Root>
- -- end Pack_1;
-
- -- with Pack_1;
- -- package Pack_2 is
- -- type Child is new Pack_1.Root with Type_DIC => ...;
- -- <underlying full view of Child>
- -- end Pack_2;
-
- -- As a result, the processing of the full view must also consider
- -- all DICs of the partial view.
-
- if Is_Untagged_Private_Derivation (Priv_Typ, Full_Typ) then
- null;
-
- -- Otherwise the DICs of the partial view are ignored
-
- else
- -- Ignore the DICs of the partial view by eliminating the view
-
- Priv_Typ := Empty;
- end if;
- end if;
-
-- Process inherited Default_Initial_Conditions for all parent types
Add_Parent_DICs (Work_Typ, Obj_Id, Stmts);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-10-01 6:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-01 6:15 [gcc r12-4017] [Ada] Assert_Failure on derived type with inherited Default_Initial_Condition 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).