diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2013-01-25 21:03:54 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2013-01-25 21:03:54 +0100 |
| commit | d7fa6ee24e3042472f53c776d30d5f10b79afc2d (patch) | |
| tree | 9f912299747d19a0c5f72e447bddfdcbd9149566 /gcc/tree-ssa-phiopt.c | |
| parent | d4a180188bed0a798818ef176c89048343277665 (diff) | |
| download | gcc-d7fa6ee24e3042472f53c776d30d5f10b79afc2d.zip gcc-d7fa6ee24e3042472f53c776d30d5f10b79afc2d.tar.gz gcc-d7fa6ee24e3042472f53c776d30d5f10b79afc2d.tar.bz2 | |
re PR middle-end/56098 (conditional write through volatile pointer produces unintended read)
PR tree-optimization/56098
* tree-ssa-phiopt.c (nt_init_block): Don't call add_or_mark_expr
for stmts with volatile ops.
(cond_store_replacement): Don't optimize if assign has volatile ops.
(cond_if_else_store_replacement_1): Don't optimize if either
then_assign or else_assign have volatile ops.
(hoist_adjacent_loads): Don't optimize if either def1 or def2 have
volatile ops.
* gcc.dg/pr56098-1.c: New test.
* gcc.dg/pr56098-2.c: New test.
From-SVN: r195475
Diffstat (limited to 'gcc/tree-ssa-phiopt.c')
| -rw-r--r-- | gcc/tree-ssa-phiopt.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c index 697e33c..eee4972 100644 --- a/gcc/tree-ssa-phiopt.c +++ b/gcc/tree-ssa-phiopt.c @@ -1342,7 +1342,7 @@ nt_init_block (struct dom_walk_data *data ATTRIBUTE_UNUSED, basic_block bb) { gimple stmt = gsi_stmt (gsi); - if (gimple_assign_single_p (stmt)) + if (gimple_assign_single_p (stmt) && !gimple_has_volatile_ops (stmt)) { add_or_mark_expr (bb, gimple_assign_lhs (stmt), nontrap_set, true); add_or_mark_expr (bb, gimple_assign_rhs1 (stmt), nontrap_set, false); @@ -1419,7 +1419,8 @@ cond_store_replacement (basic_block middle_bb, basic_block join_bb, /* Check if middle_bb contains of only one store. */ if (!assign - || !gimple_assign_single_p (assign)) + || !gimple_assign_single_p (assign) + || gimple_has_volatile_ops (assign)) return false; locus = gimple_location (assign); @@ -1490,9 +1491,11 @@ cond_if_else_store_replacement_1 (basic_block then_bb, basic_block else_bb, if (then_assign == NULL || !gimple_assign_single_p (then_assign) || gimple_clobber_p (then_assign) + || gimple_has_volatile_ops (then_assign) || else_assign == NULL || !gimple_assign_single_p (else_assign) - || gimple_clobber_p (else_assign)) + || gimple_clobber_p (else_assign) + || gimple_has_volatile_ops (else_assign)) return false; lhs = gimple_assign_lhs (then_assign); @@ -1829,7 +1832,9 @@ hoist_adjacent_loads (basic_block bb0, basic_block bb1, /* Both statements must be assignments whose RHS is a COMPONENT_REF. */ if (!gimple_assign_single_p (def1) - || !gimple_assign_single_p (def2)) + || !gimple_assign_single_p (def2) + || gimple_has_volatile_ops (def1) + || gimple_has_volatile_ops (def2)) continue; ref1 = gimple_assign_rhs1 (def1); |