From a491b7be7f9f60cb13d31d4fe87b4353f3520d1d Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Sat, 3 Mar 2012 19:55:51 -0500
Subject: [PATCH] * init.c (perform_member_init): Cope with uninstantiated
NSDMI.
From-SVN: r184877
---
gcc/cp/ChangeLog | 2 ++
gcc/cp/init.c | 6 ++++++
gcc/testsuite/ChangeLog | 2 ++
gcc/testsuite/g++.dg/cpp0x/nsdmi-defer6.C | 8 ++++++++
4 files changed, 18 insertions(+)
create mode 100644 gcc/testsuite/g++.dg/cpp0x/nsdmi-defer6.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f1eb802f9c17..f837570b7adb 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
2012-03-03 Jason Merrill <jason@redhat.com>
+ * init.c (perform_member_init): Cope with uninstantiated NSDMI.
+
Core 1270
* call.c (build_aggr_conv): Call reshape_init.
(convert_like_real): Likewise.
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 2355a04de231..1b2a1ef15ae5 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -540,6 +540,12 @@ perform_member_init (tree member, tree init)
else
{
init = DECL_INITIAL (member);
+ if (init && TREE_CODE (init) == DEFAULT_ARG)
+ {
+ error ("constructor required before non-static data member "
+ "for %qD has been parsed", member);
+ init = NULL_TREE;
+ }
/* Strip redundant TARGET_EXPR so we don't need to remap it, and
so the aggregate init code below will see a CONSTRUCTOR. */
if (init && TREE_CODE (init) == TARGET_EXPR
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 68391401b329..beb8af406c8c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
2012-03-03 Jason Merrill <jason@redhat.com>
+ * g++.dg/cpp0x/nsdmi-defer6.C: New.
+
Core 1270
* g++.dg/cpp0x/initlist65.C: New.
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer6.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer6.C
new file mode 100644
index 000000000000..033c14264ddd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer6.C
@@ -0,0 +1,8 @@
+// { dg-do compile { target c++11 } }
+
+struct A // { dg-error "non-static data member" }
+{
+ int i = (A(), 42); // { dg-message "required here" }
+};
+
+A a;
--
GitLab