tree-scalar-evolution.c (chrec_contains_symbols_defined_in_loop): Use is_gimple_min_i...

2008-03-21  Richard Guenther  <rguenther@suse.de>

	* tree-scalar-evolution.c (chrec_contains_symbols_defined_in_loop):
	Use is_gimple_min_invariant instead of TREE_INVARIANT.
	* tree-ssa-loop-ivopts.c (force_expr_to_var_cost): Likewise.
	* tree-ssa-dom.c (record_equality): Likewise.
	* tree-inline.c (copy_body_r): Likewise.
	* tree-ssa-pre.c (make_values_for_stmt): Remove test for
	TREE_INVARIANT.

From-SVN: r133403

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 02ff5fa1b1fa40d920e26422f62f8db034d87688..25d73b87eb0786cd57429d8d40e06f47ad6a6b70 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-21  Richard Guenther  <rguenther@suse.de>
+
+       * tree-scalar-evolution.c (chrec_contains_symbols_defined_in_loop):
+       Use is_gimple_min_invariant instead of TREE_INVARIANT.
+       * tree-ssa-loop-ivopts.c (force_expr_to_var_cost): Likewise.
+       * tree-ssa-dom.c (record_equality): Likewise.
+       * tree-inline.c (copy_body_r): Likewise.
+       * tree-ssa-pre.c (make_values_for_stmt): Remove test for
+       TREE_INVARIANT.
+
 2008-03-20  Kaz Kojima  <kkojima@gcc.gnu.org>
 
        * config/sh/sh.c (split_branches): Pass zero to redirect_jump

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 54cacb5a79b892705cf31da56d537505ec11ab02..216e3b4664d8a262bee8e76bb20e00558ad99d80 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -773,7 +773,7 @@ copy_body_r (tree *tp, int *walk_subtrees, void *data)
         and friends are up-to-date.  */
       else if (TREE_CODE (*tp) == ADDR_EXPR)
        {
-         int invariant = TREE_INVARIANT (*tp);
+         int invariant = is_gimple_min_invariant (*tp);
          walk_tree (&TREE_OPERAND (*tp, 0), copy_body_r, id, NULL);
          /* Handle the case where we substituted an INDIRECT_REF
             into the operand of the ADDR_EXPR.  */
@@ -783,7 +783,7 @@ copy_body_r (tree *tp, int *walk_subtrees, void *data)
            recompute_tree_invariant_for_addr_expr (*tp);
          /* If this used to be invariant, but is not any longer,
             then regimplification is probably needed.  */
-         if (invariant && !TREE_INVARIANT (*tp))
+         if (invariant && !is_gimple_min_invariant (*tp))
            id->regimplify = true;
          *walk_subtrees = 0;
        }

diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index 4d771b7e5dd6545eca8cec7aa20435d04dc4edac..29f0dcf8f4c3eb65d740e0859bb9ef7cc9d7d85d 100644 (file)
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -360,7 +360,7 @@ chrec_contains_symbols_defined_in_loop (const_tree chrec, unsigned loop_nb)
   if (chrec == NULL_TREE)
     return false;
 
-  if (TREE_INVARIANT (chrec))
+  if (is_gimple_min_invariant (chrec))
     return false;
 
   if (TREE_CODE (chrec) == VAR_DECL

diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 4d95261bc73b83bfe5e248c77851f24057d7cfd5..64ff4efca852cb43424c4d3daa1c160bdff6b1a2 100644 (file)
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -1146,11 +1146,12 @@ record_equality (tree x, tree y)
      (by depth), then use that.
      Otherwise it doesn't matter which value we choose, just so
      long as we canonicalize on one value.  */
-  if (TREE_INVARIANT (y))
+  if (is_gimple_min_invariant (y))
     ;
-  else if (TREE_INVARIANT (x) || (loop_depth_of_name (x) <= loop_depth_of_name (y)))
+  else if (is_gimple_min_invariant (x)
+          || (loop_depth_of_name (x) <= loop_depth_of_name (y)))
     prev_x = x, x = y, y = prev_x, prev_x = prev_y;
-  else if (prev_x && TREE_INVARIANT (prev_x))
+  else if (prev_x && is_gimple_min_invariant (prev_x))
     x = y, y = prev_x, prev_x = prev_y;
   else if (prev_y && TREE_CODE (prev_y) != VALUE_HANDLE)
     y = prev_y;

diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index 9b406ce06ef8a0f2d1553099dcdbdb3a8b9ef0e1..93f3be6b502dfc3873310a126564cb17a810ed10 100644 (file)
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -3222,7 +3222,7 @@ force_expr_to_var_cost (tree expr)
   if (SSA_VAR_P (expr))
     return zero_cost;
 
-  if (TREE_INVARIANT (expr))
+  if (is_gimple_min_invariant (expr))
     {
       if (TREE_CODE (expr) == INTEGER_CST)
        return new_cost (integer_cost, 0);

diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index e6a931d94409090bfcead19a34a8aeb7a796943d..13c4e979b7de2e2ba7b4f921f297eebba069ab97 100644 (file)
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -3369,7 +3369,6 @@ make_values_for_stmt (tree stmt, basic_block block)
            && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (rhs))
           || is_gimple_min_invariant (rhs)
           || TREE_CODE (rhs) == ADDR_EXPR
-          || TREE_INVARIANT (rhs)
           || DECL_P (rhs))
     {