From: Jakub Jelinek <jakub@redhat.com>
Date: Sun, 16 Jan 2011 20:23:01 +0000 (+0100)
Subject: backport: re PR middle-end/45852 (volatile structs are broken!)
X-Git-Tag: releases/gcc-4.5.3~302
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a6a59f088dd02cc75fc8d657ee99f3d16cf98c0;p=thirdparty%2Fgcc.git

backport: re PR middle-end/45852 (volatile structs are broken!)

	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.

From-SVN: r168867
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db6b41f75757..9db1eae1c77d 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-16  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/43655
diff --git a/gcc/expr.c b/gcc/expr.c
index db179bbf104e..59b869048c10 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -4730,7 +4730,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 b83af10d258a..840b45323f2f 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-16  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/43655
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 } } */