pt.c (tsubst_decl): Use void_zero_node instead of error_mark_node as a placeholder.

	* pt.c (tsubst_decl) [FIELD_DECL]: Use void_zero_node
	instead of error_mark_node as a placeholder.

From-SVN: r180001

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aac66d540b418f61a3a073544b0293620bc56206..0edf96641f672c7777b6271e358ac3a13a6dd9df 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-14  Jason Merrill  <jason@redhat.com>
+
+       * pt.c (tsubst_decl) [FIELD_DECL]: Use void_zero_node
+       instead of error_mark_node as a placeholder.
+
 2011-10-14  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/38174

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 1632c01ebce34edea9db74b20ce1e25216f3fbaa..bbe113980e09ec1146229fdbb5c516e893c02761 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -10273,8 +10273,8 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
          {
            /* Set up DECL_TEMPLATE_INFO so that we can get at the
               NSDMI in perform_member_init.  Still set DECL_INITIAL
-              to error_mark_node so that we know there is one.  */
-           DECL_INITIAL (r) = error_mark_node;
+              so that we know there is one.  */
+           DECL_INITIAL (r) = void_zero_node;
            gcc_assert (DECL_LANG_SPECIFIC (r) == NULL);
            retrofit_lang_decl (r);
            DECL_TEMPLATE_INFO (r) = build_template_info (t, args);