From: Eric Botcazou <ebotcazou@adacore.com>
Date: Sat, 23 Nov 2013 10:23:02 +0000 (+0000)
Subject: gimplify.h (recalculate_side_effects): Delete.
X-Git-Tag: releases/gcc-4.9.0~2502
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66c14933d176de277020532295606e73c3b78162;p=thirdparty%2Fgcc.git

gimplify.h (recalculate_side_effects): Delete.

	* gimplify.h (recalculate_side_effects): Delete.
	* gimplify.c (recalculate_side_effects): Make static and add comment.
ada/
	* gcc-interface/trans.c (Loop_Statement_to_gnu): Set TREE_SIDE_EFFECTS
	on the conditional expression directly.

From-SVN: r205305
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df5b4b8ab8e0..32955d7eaf4f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gimplify.h (recalculate_side_effects): Delete.
+	* gimplify.c (recalculate_side_effects): Make static and add comment.
+
 2013-11-23  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* config/sh/sh.md: Use nonimmediate_operand rather than general_operand
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 12737c9431f2..8bb3462bc5a5 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Loop_Statement_to_gnu): Set TREE_SIDE_EFFECTS
+	on the conditional expression directly.
+
 2013-11-22  Andrew MacLeod  <amacleod@redhat.com>
 
 	* gcc-interface/trans.c: Add required include files from gimple.h.
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 2266a5b119b5..e533de6dcbf7 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -2808,8 +2808,8 @@ Loop_Statement_to_gnu (Node_Id gnat_node)
   if (gnu_cond_expr)
     {
       COND_EXPR_THEN (gnu_cond_expr) = gnu_loop_stmt;
+      TREE_SIDE_EFFECTS (gnu_cond_expr) = 1;
       gnu_result = gnu_cond_expr;
-      recalculate_side_effects (gnu_cond_expr);
     }
   else
     gnu_result = gnu_loop_stmt;
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index b3608c3171d3..b252bef6508c 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -1757,7 +1757,9 @@ gimplify_var_or_parm_decl (tree *expr_p)
   return GS_ALL_DONE;
 }
 
-void
+/* Recalculate the value of the TREE_SIDE_EFFECTS flag for T.  */
+
+static void
 recalculate_side_effects (tree t)
 {
   enum tree_code code = TREE_CODE (t);
diff --git a/gcc/gimplify.h b/gcc/gimplify.h
index 049f80dd0a84..91000d1e6b75 100644
--- a/gcc/gimplify.h
+++ b/gcc/gimplify.h
@@ -64,7 +64,6 @@ extern tree unshare_expr (tree);
 extern tree unshare_expr_without_location (tree);
 extern tree voidify_wrapper_expr (tree, tree);
 extern tree build_and_jump (tree *);
-extern void recalculate_side_effects (tree);
 extern enum gimplify_status gimplify_self_mod_expr (tree *, gimple_seq *,
 						    gimple_seq *, bool, tree);
 extern tree gimple_boolify (tree);