re PR rtl-optimization/53352 (Incorrect CSE optimization on RTL expressions with...

gcc/
2012-05-15  Meador Inge  <meadori@codesourcery.com>

	PR rtl-optimization/53352
	* cse.c (equiv_constant): Ignore paradoxical subregs.

gcc/testsuite/
2012-05-15  Meador Inge  <meadori@codesourcery.com>

	PR rtl-optimization/53352
	* gcc.dg/pr53352.c: New test.

From-SVN: r187648

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 320ae0d09ccaf026fd3fe7b6acdff2128a9bdf3e..ea1941e17b9003c7d507c6fd94bbe754b20b6994 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-18  Meador Inge  <meadori@codesourcery.com>
+
+       PR rtl-optimization/53352
+       * cse.c (equiv_constant): Ignore paradoxical subregs.
+
 2012-05-17  Steven Bosscher  <steven@gcc.gnu.org>
 
        PR rtl-optimization/53125

diff --git a/gcc/cse.c b/gcc/cse.c
index 0ad7b2e2a46cd141c4e6ddacedbb9e013f95a954..9f4e97932eda5511565b19e2d3f06476ac2a7e17 100644 (file)
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -3786,8 +3786,12 @@ equiv_constant (rtx x)
            }
        }
 
-      /* Otherwise see if we already have a constant for the inner REG.  */
+      /* Otherwise see if we already have a constant for the inner REG,
+        and if that is enough to calculate an equivalent constant for
+        the subreg.  Note that the upper bits of paradoxical subregs
+        are undefined, so they cannot be said to equal anything.  */
       if (REG_P (SUBREG_REG (x))
+         && GET_MODE_SIZE (mode) <= GET_MODE_SIZE (imode)
          && (new_rtx = equiv_constant (SUBREG_REG (x))) != 0)
         return simplify_subreg (mode, new_rtx, imode, SUBREG_BYTE (x));
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 22f2982bbab26d47a02580d9d3bb9529060ae7e5..64a011c0e8765e022cc0d208a5cee1e64335502c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-18  Meador Inge  <meadori@codesourcery.com>
+
+       PR rtl-optimization/53352
+       * gcc.dg/pr53352.c: New test.
+
 2012-05-17  David S. Miller  <davem@davemloft.net>
 
        * gfortran.dg/bessel_7.f90: Bump allowed precision to avoid

diff --git a/gcc/testsuite/gcc.dg/pr53352.c b/gcc/testsuite/gcc.dg/pr53352.c
new file mode 100644 (file)
index 0000000..1d2edf8
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr53352.c
@@ -0,0 +1,41 @@
+/* { dg-do run } */
+/* { dg-options "-O1" } */
+
+#include <stdlib.h>
+
+typedef union
+{
+  struct
+  {
+    unsigned char a;
+    unsigned char b;
+    unsigned char c;
+    unsigned char d;
+  } parts;
+  unsigned long whole;
+} T;
+
+T *g_t;
+
+void bar (unsigned long x)
+{
+  if (x != 0)
+    abort ();
+}
+
+int main ()
+{
+  T one;
+  T two;
+  T tmp1, tmp2;
+
+  one.whole = 0xFFE0E0E0UL;
+  two.whole = 0xFF000000UL;
+  tmp1.parts = two.parts;
+  tmp2.parts = one.parts;
+  tmp2.parts.c = tmp1.parts.c;
+  one.parts = tmp2.parts;
+
+  g_t = &one;
+  bar (0);
+}