From: Ed Schonberg <schonberg@adacore.com>
Date: Mon, 28 May 2018 08:54:18 +0000 (+0000)
Subject: [Ada] Copy index expression trees rather than relocating them
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1541ede1e18b72f77b84fdef0478e97684d14cf1;p=gcc.git

[Ada] Copy index expression trees rather than relocating them

2018-05-28  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/

	* exp_aggr.adb (Flatten): Copy tree of expression in a component
	association with a range or a set of discrete choices, rather than
	relocating the node. This avoids inconsistencies in the tree when
	handling nested subprograms with uplevel references for LLVM.

From-SVN: r260829
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a9f89f5749c..95e4822412f 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2018-05-28  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_aggr.adb (Flatten): Copy tree of expression in a component
+	association with a range or a set of discrete choices, rather than
+	relocating the node. This avoids inconsistencies in the tree when
+	handling nested subprograms with uplevel references for LLVM.
+
 2018-05-28  Arnaud Charlet  <charlet@adacore.com>
 
 	* exp_util.adb (Possible_Bit_Aligned_Component): Always return False in
diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb
index c7158a39554..cedc7224f28 100644
--- a/gcc/ada/exp_aggr.adb
+++ b/gcc/ada/exp_aggr.adb
@@ -4490,7 +4490,9 @@ package body Exp_Aggr is
                      return False;
                   end if;
 
-                  Vals (Num) := Relocate_Node (Elmt);
+                  --  Duplicate expression for each index it covers.
+
+                  Vals (Num) := New_Copy_Tree (Elmt);
                   Num := Num + 1;
 
                   Next (Elmt);