From 46b380a23b6504fe3c5747673e8897debc42a633 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 24 Apr 2012 14:41:49 +0000 Subject: [PATCH] re PR tree-optimization/53085 (writes to volatile struct members is missing) 2012-04-24 Richard Guenther PR tree-optimization/53085 * tree-ssa-pre.c (eliminate): Do not eliminate volatile redundant stores. * g++.dg/torture/pr53085.C: New testcase. From-SVN: r186764 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/torture/pr53085.C | 17 +++++++++++++++++ gcc/tree-ssa-pre.c | 1 + 4 files changed, 29 insertions(+) create mode 100644 gcc/testsuite/g++.dg/torture/pr53085.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 86dc9c708a6..27a67a50d91 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-04-24 Richard Guenther + + PR tree-optimization/53085 + * tree-ssa-pre.c (eliminate): Do not eliminate volatile redundant + stores. + 2012-04-24 Richard Guenther * tree-if-conv.c (main_tree_if_conversion): Move bb under diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9205f4299ce..646a150f134 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-04-24 Richard Guenther + + PR tree-optimization/53085 + * g++.dg/torture/pr53085.C: New testcase. + 2012-04-24 Andrew Pinski PR tree-opt/33512 diff --git a/gcc/testsuite/g++.dg/torture/pr53085.C b/gcc/testsuite/g++.dg/torture/pr53085.C new file mode 100644 index 00000000000..9ee29fec1a7 --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr53085.C @@ -0,0 +1,17 @@ +// { dg-do compile } +// { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } { "" } } +// { dg-options "-fdump-tree-optimized" } + +class aa{ + void f(); +private: + volatile int a; +}; + +void aa::f(){ + a=1; + a=1; +} + +// { dg-final { scan-tree-dump-times "a ={v} 1;" 2 "optimized" } } +// { dg-final { cleanup-tree-dump "optimized" } } diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index 5e6f5708ad1..e3e55ef48a8 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -4409,6 +4409,7 @@ eliminate (void) has the same value number as its rhs. If so, the store is dead. */ else if (gimple_assign_single_p (stmt) + && !gimple_has_volatile_ops (stmt) && !is_gimple_reg (gimple_assign_lhs (stmt)) && (TREE_CODE (rhs) == SSA_NAME || is_gimple_min_invariant (rhs))) -- 2.30.2