diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2014-01-17 15:40:13 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2014-01-17 15:40:13 +0000 |
| commit | 12185846cf9a347fdbd3b3e192100d9be1718bde (patch) | |
| tree | af169bab8da237b96212c0bac6719a2d248366f6 /gcc | |
| parent | 9a7f94d78b9468ba79ebad169fb1f262cf5950ac (diff) | |
| download | gcc-12185846cf9a347fdbd3b3e192100d9be1718bde.zip gcc-12185846cf9a347fdbd3b3e192100d9be1718bde.tar.gz gcc-12185846cf9a347fdbd3b3e192100d9be1718bde.tar.bz2 | |
re PR c++/59269 (ICE with reference in union)
/cp
2014-01-17 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/59269
* init.c (build_value_init_noctor): Assert !TYPE_HAS_COMPLEX_DFLT
only when errorcount == 0.
/testsuite
2014-01-17 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/59269
* g++.dg/cpp0x/nsdmi-union4.C: New.
From-SVN: r206718
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/init.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/nsdmi-union4.C | 12 |
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 66896d9..45a6c97 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-01-17 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/59269 + * init.c (build_value_init_noctor): Assert !TYPE_HAS_COMPLEX_DFLT + only when errorcount == 0. + 2014-01-17 Marek Polacek <polacek@redhat.com> PR c++/59838 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 67761dc..931b5c8 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -382,7 +382,8 @@ build_value_init_noctor (tree type, tsubst_flags_t complain) SFINAE-enabled. */ if (CLASS_TYPE_P (type)) { - gcc_assert (!TYPE_HAS_COMPLEX_DFLT (type)); + gcc_assert (!TYPE_HAS_COMPLEX_DFLT (type) + || errorcount != 0); if (TREE_CODE (type) != UNION_TYPE) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6d57b41..98bc528 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-01-17 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/59269 + * g++.dg/cpp0x/nsdmi-union4.C: New. + 2014-01-17 Marek Polacek <polacek@redhat.com> PR c++/59838 diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-union4.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-union4.C new file mode 100644 index 0000000..c21fdca --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-union4.C @@ -0,0 +1,12 @@ +// PR c++/59269 +// { dg-require-effective-target c++11 } + +union U +{ + int& i = 0; // { dg-error "reference" } +}; + +void foo() +{ + U(); +} |