* init.c (perform_member_init): Cope with uninstantiated NSDMI.

From-SVN: r184877

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f1eb802f9c172417f518ebfb26923c3f2e7d3b13..f837570b7adba34497b760d06e12668d5b67a638 100644 (file)
--- 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 2355a04de23150abac7e36ec9b22ffdd30da2bde..1b2a1ef15ae530e0263d006c54f2099632f4ed02 100644 (file)
--- 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 68391401b3296f267a7439c6e4e9ab8f930a87ae..beb8af406c8cc1ca292f23ba6e41346f017a6df2 100644 (file)
--- 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 (file)
index 0000000..033c142
--- /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;