From b2e519796c72be6179052d738b0b645b926ab23a Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 25 Sep 2012 07:51:51 +0000 Subject: [PATCH] re PR tree-optimization/53663 (inconsistent inline handling of bool within union) 2012-09-25 Richard Guenther PR tree-optimization/53663 * tree-ssa-sccvn.c (vn_reference_lookup_3): Conditional native encode/interpret translation on VN_WALKREWRITE. * gcc.dg/torture/pr53663-1.c: New testcase. * gcc.dg/torture/pr53663-2.c: Likewise. * gcc.dg/torture/pr53663-3.c: Likewise. From-SVN: r191694 --- gcc/ChangeLog | 6 +++++ gcc/testsuite/ChangeLog | 7 ++++++ gcc/testsuite/gcc.dg/torture/pr53663-1.c | 30 ++++++++++++++++++++++++ gcc/testsuite/gcc.dg/torture/pr53663-2.c | 24 +++++++++++++++++++ gcc/testsuite/gcc.dg/torture/pr53663-3.c | 24 +++++++++++++++++++ gcc/tree-ssa-sccvn.c | 3 ++- 6 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr53663-1.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr53663-2.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr53663-3.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 36a918635b9..8bcade673c2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-09-25 Richard Guenther + + PR tree-optimization/53663 + * tree-ssa-sccvn.c (vn_reference_lookup_3): Conditional + native encode/interpret translation on VN_WALKREWRITE. + 2012-09-24 Dehao Chen * tree-cfg.c (move_stmt_op): Reset the expr block only diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9a9dc4b14bd..d94545905e9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2012-09-25 Richard Guenther + + PR tree-optimization/53663 + * gcc.dg/torture/pr53663-1.c: New testcase. + * gcc.dg/torture/pr53663-2.c: Likewise. + * gcc.dg/torture/pr53663-3.c: Likewise. + 2012-09-25 Uros Bizjak * gcc.target/i386/pr50725.c: Change 'long' to 'long long'. diff --git a/gcc/testsuite/gcc.dg/torture/pr53663-1.c b/gcc/testsuite/gcc.dg/torture/pr53663-1.c new file mode 100644 index 00000000000..3392ddecb51 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr53663-1.c @@ -0,0 +1,30 @@ +/* { dg-do run } */ + +extern void abort (void); + +union u +{ + int i; + _Bool b; +}; + +void f(union u * vp, union u v) +{ + *vp = v; +} + +int main() +{ + union u v; + union u v1; + union u v2; + + v.i = 10; + f(&v1, v); + + v.b = 0; + f(&v2, v); + if (v2.b != 0) + abort (); + return 0; +} diff --git a/gcc/testsuite/gcc.dg/torture/pr53663-2.c b/gcc/testsuite/gcc.dg/torture/pr53663-2.c new file mode 100644 index 00000000000..9589a9e2054 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr53663-2.c @@ -0,0 +1,24 @@ +/* { dg-do run } */ + +extern void abort (void); + +union u +{ + int i; + short f; +} v; + +short foo (short *f) +{ + *f = 1; + v.i = 0; + v.f = 0; + return *f; +} + +int main() +{ + if (foo (&v.f) != 0) + abort (); + return 0; +} diff --git a/gcc/testsuite/gcc.dg/torture/pr53663-3.c b/gcc/testsuite/gcc.dg/torture/pr53663-3.c new file mode 100644 index 00000000000..96af5db10ac --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr53663-3.c @@ -0,0 +1,24 @@ +/* { dg-do run } */ + +extern void abort (void); + +union u +{ + int i; + float f; +} v; + +float foo (float *f) +{ + *f = 1; + v.i = 0; + v.f = 0.; + return *f; +} + +int main() +{ + if (foo (&v.f) != 0.) + abort (); + return 0; +} diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index 2e5ed741a02..9e62ebe2e18 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -1555,7 +1555,8 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_) /* 3) Assignment from a constant. We can use folds native encode/interpret routines to extract the assigned bits. */ - else if (CHAR_BIT == 8 && BITS_PER_UNIT == 8 + else if (vn_walk_kind == VN_WALKREWRITE + && CHAR_BIT == 8 && BITS_PER_UNIT == 8 && ref->size == maxsize && maxsize % BITS_PER_UNIT == 0 && offset % BITS_PER_UNIT == 0