From f07049c8f1741e8a56f8e6dc3702216a652a532d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 3 Mar 2009 12:29:51 +0100 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr39343.c | 29 +++++++++++++++++++++++++++++ gcc/tree-ssa-ccp.c | 3 +-- 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr39343.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 998ef44dc55..72da01fc060 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-03-03 Jakub Jelinek + + 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 PR middle-end/39335 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5d5b9679c53..3bb4d97c658 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-03-03 Jakub Jelinek + + PR tree-optimization/39343 + * gcc.dg/pr39343.c: New test. + 2009-03-03 Ira Rosen PR tree-optimization/39248 diff --git a/gcc/testsuite/gcc.dg/pr39343.c b/gcc/testsuite/gcc.dg/pr39343.c new file mode 100644 index 00000000000..70df59ef098 --- /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 d6027268a7d..5080cc32ce7 100644 --- 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 -- 2.30.2