re PR tree-optimization/39343 (Wrong result for __builtin_object_size (x, 1))

	PR tree-optimization/39343
	* tree-ssa-ccp.c (maybe_fold_offset_to_address): Don't check if
	COMPONENT_REF t has ARRAY_TYPE.

	* gcc.dg/pr39343.c: New test.

From-SVN: r144571

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 998ef44dc555718baa1087a801514146ffe04ff6..72da01fc0607fe6f95b9a1a629a24f0a7e928d58 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-03  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/39343
+       * tree-ssa-ccp.c (maybe_fold_offset_to_address): Don't check if
+       COMPONENT_REF t has ARRAY_TYPE.
+
 2009-03-02  Sebastian Pop  <sebastian.pop@amd.com>
 
        PR middle-end/39335

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5d5b9679c535dc0ac8c990697635141a246e0853..3bb4d97c658d2866f05a89a49fad27545604c837 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-03  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/39343
+       * gcc.dg/pr39343.c: New test.
+
 2009-03-03  Ira Rosen  <irar@il.ibm.com>
 
        PR tree-optimization/39248

diff --git a/gcc/testsuite/gcc.dg/pr39343.c b/gcc/testsuite/gcc.dg/pr39343.c
new file mode 100644 (file)
index 0000000..70df59e
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr39343.c
@@ -0,0 +1,29 @@
+/* PR tree-optimization/39343 */
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+extern void abort (void);
+
+extern inline __attribute__ ((__always_inline__)) int
+foo (char *dest)
+{
+  return __builtin_object_size (dest, 1);
+}
+
+struct S
+{
+  union
+  {
+    struct { int a, b; char c, d; } f;
+    struct { struct { int a, b; char c, d[255]; } e; } g;
+  } u;
+};
+
+int
+main (void)
+{
+  struct S s;
+  if (foo (s.u.g.e.d) != 255)
+    abort ();
+  return 0;
+}

diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index d6027268a7d533723073d4057c0e9dc5e78eb0aa..5080cc32ce7c7fa3d403794f842a668ecb36b0cf 100644 (file)
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -1942,8 +1942,7 @@ maybe_fold_offset_to_address (tree addr, tree offset, tree orig_type)
           || (TREE_CODE (orig) == COMPONENT_REF
               && TREE_CODE (TREE_TYPE (TREE_OPERAND (orig, 1))) == ARRAY_TYPE))
          && (TREE_CODE (t) == ARRAY_REF
-             || (TREE_CODE (t) == COMPONENT_REF
-                 && TREE_CODE (TREE_TYPE (TREE_OPERAND (t, 1))) == ARRAY_TYPE))
+             || TREE_CODE (t) == COMPONENT_REF)
          && !operand_equal_p (TREE_CODE (orig) == ARRAY_REF
                               ? TREE_OPERAND (orig, 0) : orig,
                               TREE_CODE (t) == ARRAY_REF