init.c (perform_member_init): Instantiate NSDMI here.

	* init.c (perform_member_init): Instantiate NSDMI here.
	* pt.c (tsubst_decl) [FIELD_DECL]: Not here.

From-SVN: r179157

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f1496b63d8950de24496571992d8ba90ed5112d8..fc5436a1e7e666f780210cab668534028f648474 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-24  Jason Merrill  <jason@redhat.com>
 
+       * init.c (perform_member_init): Instantiate NSDMI here.
+       * pt.c (tsubst_decl) [FIELD_DECL]: Not here.
+
        Handle deferred parsing of NSDMIs.
        * parser.h (cp_unparsed_functions_entry): Add nsdmis field.
        * parser.c (unparsed_nsdmis, cp_parser_save_nsdmi): New.

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index f5904d5ddc2d1535865fdd8a57c9613603cbd010..f246286e767b833574b2cf74d915471fdbc6238d 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -496,7 +496,17 @@ perform_member_init (tree member, tree init)
   /* Use the non-static data member initializer if there was no
      mem-initializer for this field.  */
   if (init == NULL_TREE)
-    init = break_out_target_exprs (DECL_INITIAL (member));
+    {
+      if (CLASSTYPE_TEMPLATE_INSTANTIATION (DECL_CONTEXT (member)))
+       /* Do deferred instantiation of the NSDMI.  */
+       init = (tsubst_copy_and_build
+               (DECL_INITIAL (member),
+                CLASSTYPE_TI_ARGS (DECL_CONTEXT (member)),
+                tf_warning_or_error, member, /*function_p=*/false,
+                /*integral_constant_expression_p=*/false));
+      else
+       init = break_out_target_exprs (DECL_INITIAL (member));
+    }
 
   /* Effective C++ rule 12 requires that all data members be
      initialized.  */

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index af5ca5cee842ce1832b9273c4f63ee6c79cf3e92..ebadebf1b4893e7d1550b11b4581891a2ea01b18 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -10264,11 +10264,14 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
        TREE_TYPE (r) = type;
        cp_apply_type_quals_to_decl (cp_type_quals (type), r);
 
-       /* DECL_INITIAL gives the number of bits in a bit-field.  */
-       DECL_INITIAL (r)
-         = tsubst_expr (DECL_INITIAL (t), args,
-                        complain, in_decl,
-                        /*integral_constant_expression_p=*/true);
+       if (DECL_C_BIT_FIELD (r))
+         /* For bit-fields, DECL_INITIAL gives the number of bits.  For
+            non-bit-fields DECL_INITIAL is a non-static data member
+            initializer, which gets deferred instantiation.  */
+         DECL_INITIAL (r)
+           = tsubst_expr (DECL_INITIAL (t), args,
+                          complain, in_decl,
+                          /*integral_constant_expression_p=*/true);
        /* We don't have to set DECL_CONTEXT here; it is set by
           finish_member_declaration.  */
        DECL_CHAIN (r) = NULL_TREE;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1e516695aa6a4472c47d839867b05df94de9ef34..a8b10cda8ff8fe6744ed3a00da2a65fe47f77b07 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-09-24  Jason Merrill  <jason@redhat.com>
 
+       * g++.dg/cpp0x/nsdmi-defer3.C: New.
+
        * g++.dg/cpp0x/nsdmi-defer1.C: New.
        * g++.dg/cpp0x/nsdmi-defer2.C: New.
 

diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer3.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer3.C
new file mode 100644 (file)
index 0000000..2777fb5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer3.C
@@ -0,0 +1,19 @@
+// Do NSDMI get deferred instantiation?
+// { dg-options -std=c++0x }
+
+template <class T>
+struct A
+{
+  T t = T(42);
+  constexpr A() { }
+  A(T t): t(t) { }
+};
+
+struct B { };
+
+#define SA(X) static_assert(X,#X)
+
+constexpr A<int> a1;
+SA(a1.t == 42);
+
+A<B> a2 {B()};