From efb71232412323c504f3af95ed6679abfd15cb7a Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 23 Nov 2016 11:24:55 +0000 Subject: [PATCH] re PR lto/78472 (warning: type of 's' does not match original declaration from zero length bitfield in C vs C++) 2016-11-23 Richard Biener PR lto/78472 * tree.c (gimple_canonical_types_compatible_p): Ignore zero-sized fields. lto/ * lto.c (hash_canonical_type): Ignore zero-sized fields. * g++.dg/lto/pr78472_0.c: New testcase. * g++.dg/lto/pr78472_1.C: Likewise. From-SVN: r242746 --- gcc/ChangeLog | 6 ++++++ gcc/lto/ChangeLog | 5 +++++ gcc/lto/lto.c | 4 +++- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/lto/pr78472_0.c | 12 ++++++++++++ gcc/testsuite/g++.dg/lto/pr78472_1.C | 9 +++++++++ gcc/tree.c | 10 +++++++--- 7 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/lto/pr78472_0.c create mode 100644 gcc/testsuite/g++.dg/lto/pr78472_1.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7c7ff4c61be..c0c529f5faa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-11-23 Richard Biener + + PR lto/78472 + * tree.c (gimple_canonical_types_compatible_p): Ignore zero-sized + fields. + 2016-11-23 Richard Biener Prathamesh Kulkarni diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 732fc8a53ec..cf65f022886 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,8 @@ +2016-11-23 Richard Biener + + PR lto/78472 + * lto.c (hash_canonical_type): Ignore zero-sized fields. + 2016-11-21 Bernd Edlinger PR c++/71973 diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index a01b4813f36..6706557b221 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -373,7 +373,9 @@ hash_canonical_type (tree type) tree f; for (f = TYPE_FIELDS (type), nf = 0; f; f = TREE_CHAIN (f)) - if (TREE_CODE (f) == FIELD_DECL) + if (TREE_CODE (f) == FIELD_DECL + && (! DECL_SIZE (f) + || ! integer_zerop (DECL_SIZE (f)))) { iterative_hash_canonical_type (TREE_TYPE (f), hstate); nf++; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bb502baf72d..f4306f02b69 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-11-23 Richard Biener + + PR lto/78472 + * g++.dg/lto/pr78472_0.c: New testcase. + * g++.dg/lto/pr78472_1.C: Likewise. + 2016-11-23 Richard Biener Prathamesh Kulkarni diff --git a/gcc/testsuite/g++.dg/lto/pr78472_0.c b/gcc/testsuite/g++.dg/lto/pr78472_0.c new file mode 100644 index 00000000000..f2dae32132e --- /dev/null +++ b/gcc/testsuite/g++.dg/lto/pr78472_0.c @@ -0,0 +1,12 @@ +// { dg-lto-do link } + +extern struct S +{ + unsigned i:4; + unsigned :0; +} s; +static void *f(void) +{ + return &s; +} +int main() {} diff --git a/gcc/testsuite/g++.dg/lto/pr78472_1.C b/gcc/testsuite/g++.dg/lto/pr78472_1.C new file mode 100644 index 00000000000..eed7f168771 --- /dev/null +++ b/gcc/testsuite/g++.dg/lto/pr78472_1.C @@ -0,0 +1,9 @@ +struct S +{ + unsigned i:4; + unsigned :0; +} s; +static void *f(void) +{ + return &s; +} diff --git a/gcc/tree.c b/gcc/tree.c index 9b0b806cb56..80675dbd9f4 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -13708,10 +13708,14 @@ gimple_canonical_types_compatible_p (const_tree t1, const_tree t2, f1 || f2; f1 = TREE_CHAIN (f1), f2 = TREE_CHAIN (f2)) { - /* Skip non-fields. */ - while (f1 && TREE_CODE (f1) != FIELD_DECL) + /* Skip non-fields and zero-sized fields. */ + while (f1 && (TREE_CODE (f1) != FIELD_DECL + || (DECL_SIZE (f1) + && integer_zerop (DECL_SIZE (f1))))) f1 = TREE_CHAIN (f1); - while (f2 && TREE_CODE (f2) != FIELD_DECL) + while (f2 && (TREE_CODE (f2) != FIELD_DECL + || (DECL_SIZE (f2) + && integer_zerop (DECL_SIZE (f2))))) f2 = TREE_CHAIN (f2); if (!f1 || !f2) break; -- 2.30.2