From 5ccbfc1fb8c8e30f15cb74696aa97956a10c5103 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Thu, 22 Jul 2010 12:14:27 +0000 Subject: [PATCH] re PR middle-end/45017 (miscompile with bitfield and optimization) 2010-07-22 Richard Guenther PR tree-optimization/45017 * tree-ssa-sccvn.c (vn_reference_eq): Make sure we honor TYPE_PRECISION of integral types in addition to size. * gcc.c-torture/execute/pr45017.c: New testcase. From-SVN: r162411 --- gcc/ChangeLog | 6 +++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/execute/pr45017.c | 22 +++++++++++++++++++ gcc/tree-ssa-sccvn.c | 15 +++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr45017.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a8b3af38cd5..b9725dce307 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-07-22 Richard Guenther + + PR tree-optimization/45017 + * tree-ssa-sccvn.c (vn_reference_eq): Make sure we honor + TYPE_PRECISION of integral types in addition to size. + 2010-07-22 Maxim Kuvyrkov * config/rs6000/sysv4.h (CHOOSE_DYNAMIC_LINKER): Default to GLIBC diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7a454a94706..35ae9948cfb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-07-22 Richard Guenther + + PR tree-optimization/45017 + * gcc.c-torture/execute/pr45017.c: New testcase. + 2010-07-22 Tobias Burnus PR fortran/45019 diff --git a/gcc/testsuite/gcc.c-torture/execute/pr45017.c b/gcc/testsuite/gcc.c-torture/execute/pr45017.c new file mode 100644 index 00000000000..37ff286cc72 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr45017.c @@ -0,0 +1,22 @@ +int tester(char *bytes) +{ + union { + struct { + unsigned int r1:4; + unsigned int r2:4; + } fmt; + char value[1]; + } ovl; + + ovl.value[0] = bytes[0]; + return ovl.fmt.r1; +} +extern void abort (void); +int main() +{ + char buff = 0x2f; + if (tester(&buff) != 0x0f) + abort (); + return 0; +} + diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index 8eafd9b9821..c99c8a8f371 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -498,6 +498,21 @@ vn_reference_eq (const void *p1, const void *p2) if (!expressions_equal_p (TYPE_SIZE (vr1->type), TYPE_SIZE (vr2->type))) return false; + if (INTEGRAL_TYPE_P (vr1->type) + && INTEGRAL_TYPE_P (vr2->type)) + { + if (TYPE_PRECISION (vr1->type) != TYPE_PRECISION (vr2->type)) + return false; + } + else if (INTEGRAL_TYPE_P (vr1->type) + && (TYPE_PRECISION (vr1->type) + != TREE_INT_CST_LOW (TYPE_SIZE (vr1->type)))) + return false; + else if (INTEGRAL_TYPE_P (vr2->type) + && (TYPE_PRECISION (vr2->type) + != TREE_INT_CST_LOW (TYPE_SIZE (vr2->type)))) + return false; + i = 0; j = 0; do