[Ada] Crash on imported object with deep initialization and No_Aborts

gcc/ada/

	* exp_util.adb (Remove_Init_Call): If a simple initialization
	call is present, and the next statement is an initialization
	block (that contains a call to a Deep_ Initialize routine),
	remove the block as well, and insert the first initialization
	call in it, in case it is needed for later relocation.
This commit is contained in:
Ed Schonberg 2021-02-01 13:12:57 -05:00 committed by Pierre-Marie de Rodat
parent 62acd2c453
commit 4b0ba35687

View file

@ -11382,6 +11382,26 @@ package body Exp_Util is
end if;
if Present (Init_Call) then
-- If restrictions have forbidden Aborts, the initialization call
-- for objects that require deep initialization has not been wrapped
-- into the following block (see Exp_Ch3, Default_Initialize_Object)
-- so if present remove it as well, and include the IP call in it,
-- in the rare case the caller may need to simply displace the
-- initialization, as is done for a later address specification.
if Nkind (Next (Init_Call)) = N_Block_Statement
and then Is_Initialization_Block (Next (Init_Call))
then
declare
IP_Call : constant Node_Id := Init_Call;
begin
Init_Call := Next (IP_Call);
Remove (IP_Call);
Prepend (IP_Call,
Statements (Handled_Statement_Sequence (Init_Call)));
end;
end if;
Remove (Init_Call);
end if;