From 6050864955eabc4cd6e98946312621ede8a6cd53 Mon Sep 17 00:00:00 2001 From: paolo Date: Fri, 17 Jan 2014 15:40:13 +0000 Subject: [PATCH] /cp 2014-01-17 Paolo Carlini PR c++/59269 * init.c (build_value_init_noctor): Assert !TYPE_HAS_COMPLEX_DFLT only when errorcount == 0. /testsuite 2014-01-17 Paolo Carlini PR c++/59269 * g++.dg/cpp0x/nsdmi-union4.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206718 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/init.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/nsdmi-union4.C | 12 ++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/nsdmi-union4.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 66896d9aa13..45a6c9778e8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-01-17 Paolo Carlini + + PR c++/59269 + * init.c (build_value_init_noctor): Assert !TYPE_HAS_COMPLEX_DFLT + only when errorcount == 0. + 2014-01-17 Marek Polacek PR c++/59838 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 67761dcf4d7..931b5c8c1d2 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 6d57b412688..98bc5280293 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-01-17 Paolo Carlini + + PR c++/59269 + * g++.dg/cpp0x/nsdmi-union4.C: New. + 2014-01-17 Marek Polacek 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 00000000000..c21fdcaed5b --- /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(); +} -- 2.11.4.GIT