public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-849] [Ada] Fix expansion of structural subprogram variants
@ 2022-05-30 8:31 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2022-05-30 8:31 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:576b7778915c1e2da8d50c8f24c5c9b5282eac5f
commit r13-849-g576b7778915c1e2da8d50c8f24c5c9b5282eac5f
Author: Piotr Trojanek <trojanek@adacore.com>
Date: Wed Apr 27 17:30:59 2022 +0200
[Ada] Fix expansion of structural subprogram variants
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.
Diff:
---
gcc/ada/exp_ch6.adb | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index 44d198798c6..7d507271428 100644
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -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,
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-30 8:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-30 8:31 [gcc r13-849] [Ada] Fix expansion of structural subprogram variants Pierre-Marie de Rodat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).