From 5a869ab8deca8c70713647e398a35fb991049c8e Mon Sep 17 00:00:00 2001 From: ppalka Date: Wed, 23 Mar 2016 21:08:32 +0000 Subject: [PATCH] Fix PR c++/70347 (default member initializer not picked up by union) gcc/cp/ChangeLog: PR c++/70347 * typeck.c (process_init_constructor_union): If the initializer is empty, use the union's NSDMI if it has one. gcc/testsuite/ChangeLog: PR c++/70347 * g++.dg/cpp1y/nsdmi-union1.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234443 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 +++++ gcc/cp/typeck2.c | 19 +++++++++++-- gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/g++.dg/cpp1y/nsdmi-union1.C | 33 +++++++++++++++++++++++ 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/nsdmi-union1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 984a030286b7..b32c72dac838 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-03-23 Patrick Palka + + PR c++/70347 + * typeck.c (process_init_constructor_union): If the initializer + is empty, use the union's NSDMI if it has one. + 2016-03-23 Patrick Palka PR c++/70332 diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 2a76c96c7d48..4ab77cda387c 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -1499,9 +1499,24 @@ process_init_constructor_union (tree type, tree init, constructor_elt *ce; int len; - /* If the initializer was empty, use default zero initialization. */ + /* If the initializer was empty, use the union's NSDMI if it has one. + Otherwise use default zero initialization. */ if (vec_safe_is_empty (CONSTRUCTOR_ELTS (init))) - return 0; + { + for (tree field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field)) + { + if (DECL_INITIAL (field)) + { + CONSTRUCTOR_APPEND_ELT (CONSTRUCTOR_ELTS (init), + field, + get_nsdmi (field, /*in_ctor=*/false)); + break; + } + } + + if (vec_safe_is_empty (CONSTRUCTOR_ELTS (init))) + return 0; + } len = CONSTRUCTOR_ELTS (init)->length (); if (len > 1) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5e3227643855..3a5cf65c2ab6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-03-23 Patrick Palka + + PR c++/70347 + * g++.dg/cpp1y/nsdmi-union1.C: New test. + 2016-03-23 Patrick Palka PR c++/70332 diff --git a/gcc/testsuite/g++.dg/cpp1y/nsdmi-union1.C b/gcc/testsuite/g++.dg/cpp1y/nsdmi-union1.C new file mode 100644 index 000000000000..d9dd0bfcc91e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/nsdmi-union1.C @@ -0,0 +1,33 @@ +// PR c++/70347 +// { dg-do run { target c++14 } } + +union A { + char a; + long b = -42; +}; + +struct B { + union { + char a = 10; + long b; + }; +}; + +A c1{}; +A c2{4}; +B c3{}; +B c4{{9}}; + +int main() { + if (c1.b != -42) + __builtin_abort (); + + if (c2.a != 4) + __builtin_abort (); + + if (c3.a != 10) + __builtin_abort (); + + if (c4.a != 9) + __builtin_abort (); +} -- 2.47.3