From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 7 Sep 2017 15:33:29 +0000 (+0000)
Subject: re PR ada/82127 (gnat.dg/specs/constructor.ads FAILs)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fac519741f39f1741dbf5c88dfc2a8b8e90d0007;p=gcc.git

re PR ada/82127 (gnat.dg/specs/constructor.ads FAILs)

	PR ada/82127
	* gcc-interface/decl.c (copy_and_substitute_in_layout): Put the fields
	in order of increasing position in more cases.

From-SVN: r251846
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index eb6fe7ad554..94224d60783 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-07  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR ada/82127
+	* gcc-interface/decl.c (copy_and_substitute_in_layout): Put the fields
+	in order of increasing position in more cases.
+
 2017-09-07  Yannick Moy  <moy@adacore.com>
 
 	* a-exetim-mingw.ads: Add contract Global=>null
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 8514d9a5a0a..baa925999fa 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -9530,12 +9530,10 @@ copy_and_substitute_in_layout (Entity_Id gnat_new_type,
 	  save_gnu_tree (gnat_field, gnu_field, false);
       }
 
-  /* If there is a variant list, a selected variant and the fields all have a
+  /* If there is no variant list or a selected variant and the fields all have
      constant position, put them in order of increasing position to match that
-     of constant CONSTRUCTORs.  Likewise if there is no variant list but a REP
-     part, since the latter has been flattened in the process.  */
-  if ((gnu_variant_list.exists () ? selected_variant : gnu_rep_part != NULL)
-      && all_constant_pos)
+     of constant CONSTRUCTORs.  */
+  if ((!gnu_variant_list.exists () || selected_variant) && all_constant_pos)
     {
       const int len = list_length (gnu_field_list);
       tree *field_arr = XALLOCAVEC (tree, len), t = gnu_field_list;