diff options
| author | Patrick Palka <ppalka@gcc.gnu.org> | 2017-02-07 02:20:48 +0000 |
|---|---|---|
| committer | Patrick Palka <ppalka@gcc.gnu.org> | 2017-02-07 02:20:48 +0000 |
| commit | bb7d75ffce7a2ca526229b579666ceae01805f69 (patch) | |
| tree | 46f0838503c4e047dafbc502715a6f3ec8f4f341 /gcc | |
| parent | 10d22398b86c84be838cf3ff04302a3ee2ce726b (diff) | |
| download | gcc-bb7d75ffce7a2ca526229b579666ceae01805f69.zip gcc-bb7d75ffce7a2ca526229b579666ceae01805f69.tar.gz gcc-bb7d75ffce7a2ca526229b579666ceae01805f69.tar.bz2 | |
re PR c++/79360 (ICE with NSDMI and enum in union)
Fix PR c++/79360
gcc/cp/ChangeLog:
PR c++/79360
* typeck2.c (process_init_constructor_union): Consider only
FIELD_DECLs when looking for an NSDMI.
gcc/testsuite/ChangeLog:
PR c++/79360
* g++.dg/cpp1y/nsdmi-union2.C: New test.
From-SVN: r245239
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck2.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/nsdmi-union2.C | 12 |
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 80f1113..85bb3b5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-02-07 Patrick Palka <ppalka@gcc.gnu.org> + + PR c++/79360 + * typeck2.c (process_init_constructor_union): Consider only + FIELD_DECLs when looking for an NSDMI. + 2017-02-06 Jason Merrill <jason@redhat.com> PR c++/71193 - incomplete types in templates diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 014de5c..1e0354d 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -1510,7 +1510,8 @@ process_init_constructor_union (tree type, tree init, { for (tree field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field)) { - if (DECL_INITIAL (field)) + if (TREE_CODE (field) == FIELD_DECL + && DECL_INITIAL (field) != NULL_TREE) { CONSTRUCTOR_APPEND_ELT (CONSTRUCTOR_ELTS (init), field, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 57fe241..427615c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-02-07 Patrick Palka <ppalka@gcc.gnu.org> + + PR c++/79360 + * g++.dg/cpp1y/nsdmi-union2.C: New test. + 2017-02-06 Kito Cheng <kito.cheng@gmail.com> * lib/target-supports.exp: Define the RISC-V target. diff --git a/gcc/testsuite/g++.dg/cpp1y/nsdmi-union2.C b/gcc/testsuite/g++.dg/cpp1y/nsdmi-union2.C new file mode 100644 index 0000000..08217d7 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/nsdmi-union2.C @@ -0,0 +1,12 @@ +// PR c++/79360 +// { dg-do compile { target c++14 } } + +union U +{ + enum E { e }; +}; + +struct A +{ + U u{}; +}; |