From 56bedb147ec7829c11f20fb613ef5780ad106e4d Mon Sep 17 00:00:00 2001 From: Steve Baird Date: Thu, 25 Jun 2020 17:15:50 -0700 Subject: [PATCH] [Ada] Avoid premature finalization of a function result gcc/ada/ * exp_util.adb (Is_Related_To_Func_Return): Cope with the case where the FE introduces a type conversion. --- gcc/ada/exp_util.adb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index 8ef05d4d372..269c9e05f50 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -8740,9 +8740,14 @@ package body Exp_Util is function Is_Related_To_Func_Return (Id : Entity_Id) return Boolean is Expr : constant Node_Id := Related_Expression (Id); begin + -- In the case of a function with a class-wide result that returns + -- a call to a function with a specific result, we introduce a + -- type conversion for the return expression. We do not want that + -- type conversion to influence the result of this function. + return Present (Expr) - and then Nkind (Expr) = N_Explicit_Dereference + and then Nkind (Unqual_Conv (Expr)) = N_Explicit_Dereference and then Nkind (Parent (Expr)) = N_Simple_Return_Statement; end Is_Related_To_Func_Return; -- 2.30.2