From 218e53ea1f2b9a9a63de8ba6dc3ec0c8c1510114 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 10 Jul 2014 14:43:07 +0000 Subject: [PATCH] re PR tree-optimization/61757 (genmodes failure with enable-checking) 2014-07-10 Richard Biener PR tree-optimization/61757 * tree-ssa-dom.c (loop_depth_of_name): Restore. (propagate_rhs_into_lhs): Revert part of last change. From-SVN: r212433 --- gcc/ChangeLog | 6 ++++++ gcc/tree-ssa-dom.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d09cba9cd4e..a7dcc022c09 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-07-10 Richard Biener + + PR tree-optimization/61757 + * tree-ssa-dom.c (loop_depth_of_name): Restore. + (propagate_rhs_into_lhs): Revert part of last change. + 2014-07-10 Thomas Schwinge * fold-const.c (fold_checksum_tree): Look at DECL_VINDEX only for diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c index ef92f3024b0..4c0c276a62d 100644 --- a/gcc/tree-ssa-dom.c +++ b/gcc/tree-ssa-dom.c @@ -2638,6 +2638,33 @@ get_lhs_or_phi_result (gimple stmt) gcc_unreachable (); } +/* Return the loop depth of the basic block of the defining statement of X. + This number should not be treated as absolutely correct because the loop + information may not be completely up-to-date when dom runs. However, it + will be relatively correct, and as more passes are taught to keep loop info + up to date, the result will become more and more accurate. */ + +static int +loop_depth_of_name (tree x) +{ + gimple defstmt; + basic_block defbb; + + /* If it's not an SSA_NAME, we have no clue where the definition is. */ + if (TREE_CODE (x) != SSA_NAME) + return 0; + + /* Otherwise return the loop depth of the defining statement's bb. + Note that there may not actually be a bb for this statement, if the + ssa_name is live on entry. */ + defstmt = SSA_NAME_DEF_STMT (x); + defbb = gimple_bb (defstmt); + if (!defbb) + return 0; + + return bb_loop_depth (defbb); +} + /* Propagate RHS into all uses of LHS (when possible). RHS and LHS are derived from STMT, which is passed in solely so @@ -2653,7 +2680,8 @@ static void propagate_rhs_into_lhs (gimple stmt, tree lhs, tree rhs, bitmap interesting_names) { /* First verify that propagation is valid. */ - if (may_propagate_copy (lhs, rhs)) + if (may_propagate_copy (lhs, rhs) + && loop_depth_of_name (lhs) >= loop_depth_of_name (rhs)) { use_operand_p use_p; imm_use_iterator iter;