trans.c (gnat_to_gnu, [...]): Elaborate the expression as part of the same stmt group...

2015-01-07  Olivier Hainque  <hainque@adacore.com>

	* gcc-interface/trans.c (gnat_to_gnu, <N_Expression_With_Action>):
	Elaborate the expression as part of the same stmt group as the actions.

From-SVN: r219286

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6a752d2582916a1ef503616cfad04537f10a6238..0965f21f088706f4514650f6893eb59b821af526 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-07  Olivier Hainque  <hainque@adacore.com>
+
+       * gcc-interface/trans.c (gnat_to_gnu, <N_Expression_With_Action>):
+       Elaborate the expression as part of the same stmt group as the actions.
+
 2015-01-07  Robert Dewar  <dewar@adacore.com>
 
        * sem_ch3.adb: Minor error message change.

diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index a91c0c84433ebbd6abe4c378c746f4c2e7f02d37..e77aee0ae7d05ecb210b2b4048922dbcb0372811 100644 (file)
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -7128,13 +7128,22 @@ gnat_to_gnu (Node_Id gnat_node)
     /****************/
 
     case N_Expression_With_Actions:
-      /* This construct doesn't define a scope so we don't push a binding level
-        around the statement list; but we wrap it in a SAVE_EXPR to protect it
-        from unsharing.  */
-      gnu_result = build_stmt_group (Actions (gnat_node), false);
+      /* This construct doesn't define a scope so we don't push a binding
+        level around the statement list, but we wrap it in a SAVE_EXPR to
+        protect it from unsharing.  Elaborate the expression as part of the
+        same statement group as the actions so that the type declaration
+        gets inserted there as well.  This ensures that the type elaboration
+        code is issued past the actions computing values on which it might
+        depend.  */
+
+      start_stmt_group ();
+      add_stmt_list (Actions (gnat_node));
+      gnu_expr = gnat_to_gnu (Expression (gnat_node));
+      gnu_result = end_stmt_group ();
+
       gnu_result = build1 (SAVE_EXPR, void_type_node, gnu_result);
       TREE_SIDE_EFFECTS (gnu_result) = 1;
-      gnu_expr = gnat_to_gnu (Expression (gnat_node));
+
       gnu_result
        = build_compound_expr (TREE_TYPE (gnu_expr), gnu_result, gnu_expr);
       gnu_result_type = get_unpadded_type (Etype (gnat_node));