diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5fe196602dd2..1cd5ce6cfc82 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-11-15 Jakub Jelinek + + PR tree-optimization/46461 + * tree-ssa-forwprop.c (simplify_builtin_call): Ensure ptr1 is + a gimple val. + 2010-11-15 Ian Lance Taylor * godump.c: New file. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 41eb290a82e8..aeaf08b5d0ac 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-11-15 Jakub Jelinek + + PR tree-optimization/46461 + * gcc.c-torture/compile/pr46461.c: New test. + 2010-11-15 Tobias Burnus PR fortran/46484 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr46461.c b/gcc/testsuite/gcc.c-torture/compile/pr46461.c new file mode 100644 index 000000000000..7e38598e169e --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr46461.c @@ -0,0 +1,8 @@ +/* PR tree-optimization/46461 */ + +void +foo (char *c) +{ + c[7] = 0xff; + __builtin_memset (c + 8, 0xff, 8); +} diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index 7e7e2b152ee2..f68395a57c9a 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -1594,6 +1594,9 @@ simplify_builtin_call (gimple_stmt_iterator *gsi_p, tree callee2) memcpy call. */ gimple_stmt_iterator gsi = gsi_for_stmt (stmt1); + if (!is_gimple_val (ptr1)) + ptr1 = force_gimple_operand_gsi (gsi_p, ptr1, true, NULL_TREE, + true, GSI_SAME_STMT); gimple_call_set_fndecl (stmt2, built_in_decls [BUILT_IN_MEMCPY]); gimple_call_set_arg (stmt2, 0, ptr1); gimple_call_set_arg (stmt2, 1, new_str_cst);