diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/gimple.c | 21 | ||||
| -rw-r--r-- | gcc/tree-ssa-ifcombine.c | 2 |
3 files changed, 22 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a8e1c3c4814..f300b16e137 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2011-05-18 Richard Guenther <rguenther@suse.de> + PR tree-optimization/49018 + * gimple.c (gimple_has_side_effects): Volatile asms have side-effects. + * tree-ssa-ifcombine.c (bb_no_side_effects_p): Use + gimple_has_side_effects. + +2011-05-18 Richard Guenther <rguenther@suse.de> + * gimple.c (gimple_register_type_1): New function, split out from ... (gimple_register_type): ... here. Avoid infinite recursion. diff --git a/gcc/gimple.c b/gcc/gimple.c index cd57d5b47c0..3bf369add07 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -2354,6 +2354,10 @@ gimple_has_side_effects (const_gimple s) if (gimple_has_volatile_ops (s)) return true; + if (gimple_code (s) == GIMPLE_ASM + && gimple_asm_volatile_p (s)) + return true; + if (is_gimple_call (s)) { unsigned nargs = gimple_call_num_args (s); @@ -2368,7 +2372,7 @@ gimple_has_side_effects (const_gimple s) if (gimple_call_lhs (s) && TREE_SIDE_EFFECTS (gimple_call_lhs (s))) { - gcc_assert (gimple_has_volatile_ops (s)); + gcc_checking_assert (gimple_has_volatile_ops (s)); return true; } @@ -2379,7 +2383,7 @@ gimple_has_side_effects (const_gimple s) for (i = 0; i < nargs; i++) if (TREE_SIDE_EFFECTS (gimple_call_arg (s, i))) { - gcc_assert (gimple_has_volatile_ops (s)); + gcc_checking_assert (gimple_has_volatile_ops (s)); return true; } @@ -2388,11 +2392,14 @@ gimple_has_side_effects (const_gimple s) else { for (i = 0; i < gimple_num_ops (s); i++) - if (TREE_SIDE_EFFECTS (gimple_op (s, i))) - { - gcc_assert (gimple_has_volatile_ops (s)); - return true; - } + { + tree op = gimple_op (s, i); + if (op && TREE_SIDE_EFFECTS (op)) + { + gcc_checking_assert (gimple_has_volatile_ops (s)); + return true; + } + } } return false; diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c index bc551b2231c..e23bb763d19 100644 --- a/gcc/tree-ssa-ifcombine.c +++ b/gcc/tree-ssa-ifcombine.c @@ -107,7 +107,7 @@ bb_no_side_effects_p (basic_block bb) { gimple stmt = gsi_stmt (gsi); - if (gimple_has_volatile_ops (stmt) + if (gimple_has_side_effects (stmt) || gimple_vuse (stmt)) return false; } |