diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-01-16 22:56:10 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2011-01-16 22:56:10 +0000 |
| commit | b9609c4640ba642ac7d5da0ac879e67dccc154f1 (patch) | |
| tree | b8ac9596a5d9f06f0a1ad4cbd492fcf02198be1f | |
| parent | e83db3eeed2b67551a9b830997a0f584db65a997 (diff) | |
Backport from mainline
2010-12-21 Jakub Jelinek <jakub@redhat.com>
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_4-branch@168879 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/expr.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/i386/pr45852.c | 16 |
4 files changed, 31 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f2d5b91d1f6..5628554a6c5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,12 @@ 2011-01-16 Jakub Jelinek <jakub@redhat.com> Backport from mainline + 2010-12-21 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/45852 + * expr.c (store_expr): Ignore alt_rtl if equal to target, + but has side-effects. + 2010-12-10 Jakub Jelinek <jakub@redhat.com> PR rtl-optimization/46865 diff --git a/gcc/expr.c b/gcc/expr.c index b6bc529ff72..fd678890561 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 15642229015..d598ec87354 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2011-01-16 Jakub Jelinek <jakub@redhat.com> Backport from mainline + 2010-12-21 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/45852 + * gcc.target/i386/pr45852.c: New test. + 2010-12-10 Jakub Jelinek <jakub@redhat.com> 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 00000000000..b0ba0935deb --- /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 } } */ |