diff options
| author | Richard Guenther <rguenther@suse.de> | 2009-04-29 15:05:22 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2009-04-29 15:05:22 +0000 |
| commit | 7c90021d8ec7d24c128859b2bacb0fab720e2dfe (patch) | |
| tree | 66eaac3f5b2e2a3107730102d667f8465c06628b /gcc | |
| parent | 97a988bcb2bfbca69c5396aae923bf0001cf6802 (diff) | |
| download | gcc-7c90021d8ec7d24c128859b2bacb0fab720e2dfe.zip gcc-7c90021d8ec7d24c128859b2bacb0fab720e2dfe.tar.gz gcc-7c90021d8ec7d24c128859b2bacb0fab720e2dfe.tar.bz2 | |
re PR middle-end/39937 (Revision 146831 failed SPEC CPU 2006)
2009-04-29 Richard Guenther <rguenther@suse.de>
PR middle-end/39937
* tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Do not
loose type conversions.
(forward_propagate_addr_expr): Fix tuplification bug. Remove
stmts only if there are no uses of its definition.
* gcc.c-torture/compile/pr39937.c: New testcase.
From-SVN: r146973
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr39937.c | 12 | ||||
| -rw-r--r-- | gcc/tree-ssa-forwprop.c | 20 |
4 files changed, 39 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7d36429..3c18dfc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2009-04-29 Richard Guenther <rguenther@suse.de> + + PR middle-end/39937 + * tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Do not + loose type conversions. + (forward_propagate_addr_expr): Fix tuplification bug. Remove + stmts only if there are no uses of its definition. + 2009-04-29 Bernd Schmidt <bernd.schmidt@analog.com> * config/bfin/bfin.h (splitting_loops): Declare. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4533e4b..beb916f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2009-04-29 Richard Guenther <rguenther@suse.de> + PR middle-end/39937 + * gcc.c-torture/compile/pr39937.c: New testcase. + +2009-04-29 Richard Guenther <rguenther@suse.de> + PR tree-optimization/39941 * gcc.c-torture/compile/pr39941.c: New testcase. diff --git a/gcc/testsuite/gcc.c-torture/compile/pr39937.c b/gcc/testsuite/gcc.c-torture/compile/pr39937.c new file mode 100644 index 0000000..d023105 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr39937.c @@ -0,0 +1,12 @@ +int foo (__const char *__restrict __s); +static void +read_anisou(char line[]) +{ + foo (line+1); +} +void +read_pdbfile(void) +{ + char line[4096]; + read_anisou (line); +} diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index c596e8b..65b02af 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -862,12 +862,21 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs, of the elements in X into &x[C1 + C2/element size]. */ if (TREE_CODE (rhs2) == INTEGER_CST) { - tree new_rhs = maybe_fold_stmt_addition (gimple_expr_type (use_stmt), + tree new_rhs = maybe_fold_stmt_addition (TREE_TYPE (def_rhs), def_rhs, rhs2); if (new_rhs) { - gimple_assign_set_rhs_from_tree (use_stmt_gsi, - unshare_expr (new_rhs)); + tree type = TREE_TYPE (gimple_assign_lhs (use_stmt)); + new_rhs = unshare_expr (new_rhs); + if (!useless_type_conversion_p (type, TREE_TYPE (new_rhs))) + { + if (!is_gimple_min_invariant (new_rhs)) + new_rhs = force_gimple_operand_gsi (use_stmt_gsi, new_rhs, + true, NULL_TREE, + true, GSI_SAME_STMT); + new_rhs = fold_convert (type, new_rhs); + } + gimple_assign_set_rhs_from_tree (use_stmt_gsi, new_rhs); use_stmt = gsi_stmt (*use_stmt_gsi); update_stmt (use_stmt); tidy_after_forward_propagate_addr (use_stmt); @@ -950,9 +959,8 @@ forward_propagate_addr_expr (tree name, tree rhs) use_rhs = gimple_assign_rhs1 (use_stmt); if (result && TREE_CODE (gimple_assign_lhs (use_stmt)) == SSA_NAME - && (TREE_CODE (use_rhs) == SSA_NAME - || (CONVERT_EXPR_P (use_rhs) - && TREE_CODE (TREE_OPERAND (use_rhs, 0)) == SSA_NAME))) + && TREE_CODE (use_rhs) == SSA_NAME + && has_zero_uses (gimple_assign_lhs (use_stmt))) { gimple_stmt_iterator gsi = gsi_for_stmt (use_stmt); release_defs (use_stmt); |