From 87e0ccb46475cf8302e9bbc773d3d1fcb7cfe8dc Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sun, 16 Jan 2011 23:56:10 +0100 Subject: [PATCH] backport: re PR middle-end/45852 (volatile structs are broken!) Backport from mainline 2010-12-21 Jakub Jelinek PR middle-end/45852 * expr.c (store_expr): Ignore alt_rtl if equal to target, but has side-effects. * gcc.target/i386/pr45852.c: New test. From-SVN: r168879 --- gcc/ChangeLog | 6 ++++++ gcc/expr.c | 5 ++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/i386/pr45852.c | 16 ++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr45852.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f2d5b91d1f6a..5628554a6c50 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,12 @@ 2011-01-16 Jakub Jelinek Backport from mainline + 2010-12-21 Jakub Jelinek + + PR middle-end/45852 + * expr.c (store_expr): Ignore alt_rtl if equal to target, + but has side-effects. + 2010-12-10 Jakub Jelinek PR rtl-optimization/46865 diff --git a/gcc/expr.c b/gcc/expr.c index b6bc529ff72d..fd6788905612 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -4662,7 +4662,10 @@ store_expr (tree exp, rtx target, int call_param_p, bool nontemporal) /* If store_expr stores a DECL whose DECL_RTL(exp) == TARGET, but TARGET is not valid memory reference, TEMP will differ from TARGET although it is really the same location. */ - && !(alt_rtl && rtx_equal_p (alt_rtl, target)) + && !(alt_rtl + && rtx_equal_p (alt_rtl, target) + && !side_effects_p (alt_rtl) + && !side_effects_p (target)) /* If there's nothing to copy, don't bother. Don't call expr_size unless necessary, because some front-ends (C++) expr_size-hook must not be given objects that are not diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 156422290152..d598ec873548 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2011-01-16 Jakub Jelinek Backport from mainline + 2010-12-21 Jakub Jelinek + + PR middle-end/45852 + * gcc.target/i386/pr45852.c: New test. + 2010-12-10 Jakub Jelinek PR rtl-optimization/46865 diff --git a/gcc/testsuite/gcc.target/i386/pr45852.c b/gcc/testsuite/gcc.target/i386/pr45852.c new file mode 100644 index 000000000000..b0ba0935debd --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr45852.c @@ -0,0 +1,16 @@ +/* PR middle-end/45852 */ +/* { dg-options "-O2 -mcmodel=small" } */ +/* { dg-do compile { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */ +/* { dg-require-visibility "" } */ + +struct S { int s; }; + +volatile struct S globvar __attribute__((visibility ("hidden"))) = { -6 }; + +void +foo (void) +{ + globvar = globvar; +} + +/* { dg-final { scan-assembler-times "globvar.%?rip" 2 } } */ -- 2.47.2