[gcc r12-3849] [Ada] If unnesting and relocating subprogram call, make new Parameter_Associations

Pierre-Marie de Rodat pmderodat@gcc.gnu.org
Thu Sep 23 13:09:12 GMT 2021


https://gcc.gnu.org/g:fb3f21a3df8062a7a209b385aae377de2d8c093e

commit r12-3849-gfb3f21a3df8062a7a209b385aae377de2d8c093e
Author: Richard Kenner <kenner@adacore.com>
Date:   Tue Jul 27 12:23:23 2021 -0400

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

Diff:
---
 gcc/ada/atree.adb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gcc/ada/atree.adb b/gcc/ada/atree.adb
index 00565d66d85..e7fa8e05c3f 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;


More information about the Gcc-cvs mailing list