From 4a2ddf6697829835a010d159f7803ff13c9943b7 Mon Sep 17 00:00:00 2001 From: Ed Schonberg Date: Mon, 4 Jul 2005 15:28:00 +0200 Subject: [PATCH] exp_intr.adb (Expand_Unc_Deallocation): If the designated type is controlled... 2005-07-04 Ed Schonberg * exp_intr.adb (Expand_Unc_Deallocation): If the designated type is controlled, indicate the expected type of the dereference that is created for the call to Deep_Finalize, to prevent spurious errors when the designated type is private and completed with a derivation from another private type. From-SVN: r101579 --- gcc/ada/exp_intr.adb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/ada/exp_intr.adb b/gcc/ada/exp_intr.adb index df50c65845f..ea5d74f8b97 100644 --- a/gcc/ada/exp_intr.adb +++ b/gcc/ada/exp_intr.adb @@ -664,12 +664,21 @@ package body Exp_Intr is -- If the type is tagged, then we must force dispatching on the -- finalization call because the designated type may not be the - -- actual type of the object + -- actual type of the object. if Is_Tagged_Type (Desig_T) and then not Is_Class_Wide_Type (Desig_T) then Deref := Unchecked_Convert_To (Class_Wide_Type (Desig_T), Deref); + + elsif not Is_Tagged_Type (Desig_T) then + + -- Set type of result, to force a conversion when needed (see + -- exp_ch7, Convert_View), given that Deep_Finalize may be + -- inherited from the parent type, and we need the type of the + -- expression to see whether the conversion is in fact needed. + + Set_Etype (Deref, Desig_T); end if; Free_Cod :=