From: Gary Dismukes <dismukes@adacore.com>
Date: Tue, 20 May 2025 00:16:25 +0000 (+0000)
Subject: ada: Fix for compiler crash on function return with Relaxed_Finalization parts
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64efbc69e93e7c052300131f64b3ea5134a88d71;p=thirdparty%2Fgcc.git

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).
---

diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index 4e2bef32a35..7c18f81cb07 100644
--- a/gcc/ada/exp_ch3.adb
+++ b/gcc/ada/exp_ch3.adb
@@ -6981,7 +6981,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 :=