From 3064bb7bdf4b3e57842207a7cfbb72d686ace48a Mon Sep 17 00:00:00 2001 From: jakub Date: Sat, 31 Dec 2011 23:53:57 +0000 Subject: [PATCH] PR tree-optimization/51683 * tree-ssa-propagate.c (substitute_and_fold): Don't optimize away calls with side-effects. * tree-ssa-ccp.c (ccp_fold_stmt): Likewise. * gcc.dg/pr51683.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182761 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr51683.c | 18 ++++++++++++++++++ gcc/tree-ssa-ccp.c | 8 ++++++-- gcc/tree-ssa-propagate.c | 8 +++++++- 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr51683.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bf05b56b77b7..fec1dec22215 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-01-01 Jakub Jelinek + + PR tree-optimization/51683 + * tree-ssa-propagate.c (substitute_and_fold): Don't optimize away + calls with side-effects. + * tree-ssa-ccp.c (ccp_fold_stmt): Likewise. + 2011-12-31 Alexandre Oliva * cselib.h (cselib_add_permanent_equiv): Declare. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b1b7e3705880..6e8141412756 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-01-01 Jakub Jelinek + + PR tree-optimization/51683 + * gcc.dg/pr51683.c: New test. + 2011-12-31 Paolo Carlini PR c++/51397 diff --git a/gcc/testsuite/gcc.dg/pr51683.c b/gcc/testsuite/gcc.dg/pr51683.c new file mode 100644 index 000000000000..f5a4a8be4859 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr51683.c @@ -0,0 +1,18 @@ +/* PR tree-optimization/51683 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +static inline void * +bar (void *p, void *q, int r) +{ + return __builtin_memcpy (p, q, r); +} + +void * +foo (void *p) +{ + return bar ((void *) 0x12345000, p, 256); +} + +/* { dg-final { scan-tree-dump "memcpy" "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index a9c38ee8fad1..738606fad023 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -1,6 +1,6 @@ /* Conditional constant propagation pass for the GNU compiler. Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. Adapted from original RTL SSA-CCP by Daniel Berlin Adapted to GIMPLE trees by Diego Novillo @@ -1878,6 +1878,7 @@ ccp_fold_stmt (gimple_stmt_iterator *gsi) case GIMPLE_CALL: { tree lhs = gimple_call_lhs (stmt); + int flags = gimple_call_flags (stmt); tree val; tree argt; bool changed = false; @@ -1888,7 +1889,10 @@ ccp_fold_stmt (gimple_stmt_iterator *gsi) type issues. */ if (lhs && TREE_CODE (lhs) == SSA_NAME - && (val = get_constant_value (lhs))) + && (val = get_constant_value (lhs)) + /* Don't optimize away calls that have side-effects. */ + && (flags & (ECF_CONST|ECF_PURE)) != 0 + && (flags & ECF_LOOPING_CONST_OR_PURE) == 0) { tree new_rhs = unshare_expr (val); bool res; diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c index 80b33e11d80e..a057ad72bed5 100644 --- a/gcc/tree-ssa-propagate.c +++ b/gcc/tree-ssa-propagate.c @@ -1,5 +1,5 @@ /* Generic SSA value propagation engine. - Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Contributed by Diego Novillo @@ -1056,6 +1056,12 @@ substitute_and_fold (ssa_prop_get_value_fn get_value_fn, } else if (is_gimple_call (def_stmt)) { + int flags = gimple_call_flags (def_stmt); + + /* Don't optimize away calls that have side-effects. */ + if ((flags & (ECF_CONST|ECF_PURE)) == 0 + || (flags & ECF_LOOPING_CONST_OR_PURE)) + continue; if (update_call_from_tree (&gsi, val) && maybe_clean_or_replace_eh_stmt (def_stmt, gsi_stmt (gsi))) gimple_purge_dead_eh_edges (gimple_bb (gsi_stmt (gsi))); -- 2.39.2