From 9e10b7002acb3ce6134a6343cba04691f8c2d8ff Mon Sep 17 00:00:00 2001 From: Justin Squirek Date: Mon, 15 Nov 2021 22:14:39 +0000 Subject: [PATCH] [Ada] Invalid memory access on finalization of class-wide type gcc/ada/ * gcc-interface/decl.c (gnat_to_gnu_entity): Skip normal processing for Itypes that are E_Class_Wide_Subtype with Equivalent_Type set. --- gcc/ada/gcc-interface/decl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 449463e..3d14b5f 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -335,11 +335,14 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) /* Since a use of an itype is a definition, process it as such if it is in the main unit, except for E_Access_Subtype because it's actually a use - of its base type, see below. */ + of its base type, and for E_Class_Wide_Subtype with an Equivalent_Type + because it's actually a use of the latter type. */ if (!definition && is_type && Is_Itype (gnat_entity) && Ekind (gnat_entity) != E_Access_Subtype + && !(Ekind (gnat_entity) == E_Class_Wide_Subtype + && Present (Equivalent_Type (gnat_entity))) && !present_gnu_tree (gnat_entity) && In_Extended_Main_Code_Unit (gnat_entity)) { -- 2.7.4