diff options
| author | Richard Guenther <rguenther@suse.de> | 2011-10-05 10:54:14 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2011-10-05 10:54:14 +0000 |
| commit | d3878abfccb6f6b9235bdf084f28ebe6cc1cc490 (patch) | |
| tree | 8f305cd98368d269f8bb3b30639fd03210cf77df /gcc | |
| parent | d75fbd3dbf7f1a5bf91ccc55acf312cba4f91bae (diff) | |
| download | gcc-d3878abfccb6f6b9235bdf084f28ebe6cc1cc490.zip gcc-d3878abfccb6f6b9235bdf084f28ebe6cc1cc490.tar.gz gcc-d3878abfccb6f6b9235bdf084f28ebe6cc1cc490.tar.bz2 | |
gimple-fold.c (gimple_fold_stmt_to_constant_1): For ternary ops with an embedded expression valueize and fold that as well.
2011-10-05 Richard Guenther <rguenther@suse.de>
* gimple-fold.c (gimple_fold_stmt_to_constant_1): For
ternary ops with an embedded expression valueize and fold
that as well.
* tree-ssa-sccvn.c (try_to_simplify): Also allow SSA name
results from gimple_fold_stmt_to_constant_1.
From-SVN: r179543
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/gimple-fold.c | 13 | ||||
| -rw-r--r-- | gcc/tree-ssa-sccvn.c | 20 |
3 files changed, 32 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a50a4f4..da53b38 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2011-10-05 Richard Guenther <rguenther@suse.de> + + * gimple-fold.c (gimple_fold_stmt_to_constant_1): For + ternary ops with an embedded expression valueize and fold + that as well. + * tree-ssa-sccvn.c (try_to_simplify): Also allow SSA name + results from gimple_fold_stmt_to_constant_1. + 2011-10-05 Nick Clifton <nickc@redhat.com> * config/rx/rx.md (tablejump): Add missing label. diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index 179535e..fcfbcc8 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -2569,6 +2569,19 @@ gimple_fold_stmt_to_constant_1 (gimple stmt, tree (*valueize) (tree)) tree op1 = (*valueize) (gimple_assign_rhs2 (stmt)); tree op2 = (*valueize) (gimple_assign_rhs3 (stmt)); + /* Fold embedded expressions in ternary codes. */ + if ((subcode == COND_EXPR + || subcode == VEC_COND_EXPR) + && COMPARISON_CLASS_P (op0)) + { + tree op00 = (*valueize) (TREE_OPERAND (op0, 0)); + tree op01 = (*valueize) (TREE_OPERAND (op0, 1)); + tree tem = fold_binary_loc (loc, TREE_CODE (op0), + TREE_TYPE (op0), op00, op01); + if (tem) + op0 = tem; + } + return fold_ternary_loc (loc, subcode, gimple_expr_type (stmt), op0, op1, op2); } diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index 003804b..208c272 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -2967,27 +2967,29 @@ simplify_unary_expression (gimple stmt) static tree try_to_simplify (gimple stmt) { + enum tree_code code = gimple_assign_rhs_code (stmt); tree tem; /* For stores we can end up simplifying a SSA_NAME rhs. Just return in this case, there is no point in doing extra work. */ - if (gimple_assign_copy_p (stmt) - && TREE_CODE (gimple_assign_rhs1 (stmt)) == SSA_NAME) + if (code == SSA_NAME) return NULL_TREE; /* First try constant folding based on our current lattice. */ - tem = gimple_fold_stmt_to_constant (stmt, vn_valueize); - if (tem) + tem = gimple_fold_stmt_to_constant_1 (stmt, vn_valueize); + if (tem + && (TREE_CODE (tem) == SSA_NAME + || is_gimple_min_invariant (tem))) return tem; /* If that didn't work try combining multiple statements. */ - switch (TREE_CODE_CLASS (gimple_assign_rhs_code (stmt))) + switch (TREE_CODE_CLASS (code)) { case tcc_reference: - /* Fallthrough for some codes that can operate on registers. */ - if (!(TREE_CODE (gimple_assign_rhs1 (stmt)) == REALPART_EXPR - || TREE_CODE (gimple_assign_rhs1 (stmt)) == IMAGPART_EXPR - || TREE_CODE (gimple_assign_rhs1 (stmt)) == VIEW_CONVERT_EXPR)) + /* Fallthrough for some unary codes that can operate on registers. */ + if (!(code == REALPART_EXPR + || code == IMAGPART_EXPR + || code == VIEW_CONVERT_EXPR)) break; /* We could do a little more with unary ops, if they expand into binary ops, but it's debatable whether it is worth it. */ |