From fb3f21a3df8062a7a209b385aae377de2d8c093e Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Tue, 27 Jul 2021 12:23:23 -0400 Subject: [PATCH] [Ada] If unnesting and relocating subprogram call, make new Parameter_Associations gcc/ada/ * atree.adb (Relocate_Node): If relocating a subprgram call and we're doing unnesting, make a new Parameter_Associations, if any. --- gcc/ada/atree.adb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gcc/ada/atree.adb b/gcc/ada/atree.adb index 00565d6..e7fa8e0 100644 --- a/gcc/ada/atree.adb +++ b/gcc/ada/atree.adb @@ -1962,6 +1962,22 @@ package body Atree is Set_Original_Node (New_Node, Original_Node (Source)); end if; + -- If we're relocating a subprogram call and we're doing + -- unnesting, be sure we make a new copy of any parameter associations + -- so that we don't share them. + + if Nkind (Source) in N_Subprogram_Call + and then Opt.Unnest_Subprogram_Mode + and then Present (Parameter_Associations (Source)) + then + declare + New_Assoc : constant List_Id := Parameter_Associations (Source); + begin + Set_Parent (New_Assoc, New_Node); + Set_Parameter_Associations (New_Node, New_Assoc); + end; + end if; + return New_Node; end Relocate_Node; -- 2.7.4