diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-03-16 23:53:20 +0100 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-03-16 23:56:38 +0100 |
| commit | 2691ffe6dbaffb704593dd6220178c28848b3855 (patch) | |
| tree | 6bb3b115d089bfd0e1c6a6f2dd778cd75c4ca4b7 /gcc | |
| parent | c62f5e6e1f457462b1cea74792833821bbea64bb (diff) | |
| download | gcc-2691ffe6dbaffb704593dd6220178c28848b3855.zip gcc-2691ffe6dbaffb704593dd6220178c28848b3855.tar.gz gcc-2691ffe6dbaffb704593dd6220178c28848b3855.tar.bz2 | |
d: Fix assignment to anonymous union member corrupts sibling members in struct
gcc/d/ChangeLog:
PR d/92309
* types.cc (fixup_anonymous_offset): Don't set DECL_FIELD_OFFSET on
anonymous fields.
gcc/testsuite/ChangeLog:
PR d/92309
* gdc.dg/pr92309.d: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/d/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/d/types.cc | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gdc.dg/pr92309.d | 25 |
4 files changed, 43 insertions, 3 deletions
diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog index d9c7657..ea43e3e 100644 --- a/gcc/d/ChangeLog +++ b/gcc/d/ChangeLog @@ -1,5 +1,11 @@ 2020-03-16 Iain Buclaw <ibuclaw@gdcproject.org> + PR d/92309 + * types.cc (fixup_anonymous_offset): Don't set DECL_FIELD_OFFSET on + anonymous fields. + +2020-03-16 Iain Buclaw <ibuclaw@gdcproject.org> + PR d/92216 * decl.cc (make_thunk): Don't set TREE_PUBLIC on thunks if the target function is external to the current compilation. diff --git a/gcc/d/types.cc b/gcc/d/types.cc index 736f128..866da96 100644 --- a/gcc/d/types.cc +++ b/gcc/d/types.cc @@ -234,16 +234,20 @@ insert_aggregate_field (tree type, tree field, size_t offset) static void fixup_anonymous_offset (tree fields, tree offset) { + /* No adjustment in field offset required. */ + if (integer_zerop (offset)) + return; + while (fields != NULL_TREE) { - /* Traverse all nested anonymous aggregates to update their offset. - Set the anonymous decl offset to its first member. */ + /* Traverse all nested anonymous aggregates to update the offset of their + fields. Note that the anonymous field itself is not adjusted, as it + already has an offset relative to its outer aggregate. */ tree ftype = TREE_TYPE (fields); if (TYPE_NAME (ftype) && IDENTIFIER_ANON_P (TYPE_IDENTIFIER (ftype))) { tree vfields = TYPE_FIELDS (ftype); fixup_anonymous_offset (vfields, offset); - DECL_FIELD_OFFSET (fields) = DECL_FIELD_OFFSET (vfields); } else { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a382072..0146f8d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2020-03-16 Iain Buclaw <ibuclaw@gdcproject.org> + PR d/92309 + * gdc.dg/pr92309.d: New test. + +2020-03-16 Iain Buclaw <ibuclaw@gdcproject.org> + PR d/92216 * gdc.dg/imports/pr92216.d: New. * gdc.dg/pr92216.d: New test. diff --git a/gcc/testsuite/gdc.dg/pr92309.d b/gcc/testsuite/gdc.dg/pr92309.d new file mode 100644 index 0000000..01ebc40 --- /dev/null +++ b/gcc/testsuite/gdc.dg/pr92309.d @@ -0,0 +1,25 @@ +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92309 +// { dg-do run { target hw } } +// { dg-skip-if "needs gcc/config.d" { ! d_runtime } } + +union U +{ + struct + { + size_t a; + size_t b; + union + { + size_t c; + size_t d; + } + } +} + +void main() +{ + U u; + assert(u.a == 0); + u.d = 1; + assert(u.a == 0); +} |