OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Ada] Fix expansion of structural subprogram variants

Browse Source 
When implementing structural subprogram variants we ignored them in
expansion of the pragma itself, but not in expansion of a recursive
subprogram call. Now fixed.

gcc/ada/

	* exp_ch6.adb (Check_Subprogram_Variant): Ignore structural
	variants.
This commit is contained in:
Piotr Trojanek 2022-04-27 17:30:59 +02:00 committed by Pierre-Marie de Rodat
parent 263cb16b76
commit 576b777891
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gcc/ada/exp_ch6.adb
View File

@ -3298,19 +3298,33 @@ package body Exp_Ch6 is
Variant_Prag : constant Node_Id :=
Get_Pragma (Current_Scope, Pragma_Subprogram_Variant);
Pragma_Arg1 : Node_Id;
Variant_Proc : Entity_Id;
begin
if Present (Variant_Prag) and then Is_Checked (Variant_Prag) then
-- Analysis of the pragma rewrites its argument with a reference
-- to the internally generated procedure.
Pragma_Arg1 :=
Expression (First (Pragma_Argument_Associations (Variant_Prag)));
Variant_Proc :=
Entity
(Expression
(First
(Pragma_Argument_Associations (Variant_Prag))));
-- If pragma parameter is still an aggregate, it comes from a
-- structural variant, which is not expanded and ignored for
-- run-time execution.
if Nkind (Pragma_Arg1) = N_Aggregate then
pragma Assert
(Chars
(First
(Choices
(First (Component_Associations (Pragma_Arg1))))) =
Name_Structural);
return;
end if;
-- Otherwise, analysis of the pragma rewrites its argument with a
-- reference to the internally generated procedure.
Variant_Proc := Entity (Pragma_Arg1);
Insert_Action (Call_Node,
Make_Procedure_Call_Statement (Loc,