From debd1cd3dfd4fc53924f947f02450c357fdb7487 Mon Sep 17 00:00:00 2001 From: Gary Dismukes Date: Tue, 20 May 2025 00:16:25 +0000 Subject: [PATCH] ada: Fix for compiler crash on function return with Relaxed_Finalization parts The compiler crashes on compiling a return statement of a function whose result type has a component whose type is specified with Relaxed_Finalization. The compiler was attempting to retrieve a nonexistent BIP_Collection extra formal from the enclosing function, which may not exist in the case of result types with Relaxed_Finalization. gcc/ada/ChangeLog: * exp_ch3.adb (Build_Heap_Or_Pool_Allocator): Test not Has_Relaxed_Finalization as a guard against retrieving BIP_Collection formal (and related code). --- gcc/ada/exp_ch3.adb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index fa87149aec0..24bd34b04d5 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -6888,7 +6888,9 @@ package body Exp_Ch3 is -- Processing for objects that require finalization actions - if Needs_Finalization (Ret_Typ) then + if Needs_Finalization (Ret_Typ) + and then not Has_Relaxed_Finalization (Ret_Typ) + then declare Decls : constant List_Id := New_List; Fin_Coll_Id : constant Entity_Id := -- 2.47.2