From: Jason Merrill <jason@redhat.com>
Date: Fri, 14 Oct 2011 19:12:33 +0000 (-0400)
Subject: pt.c (tsubst_decl): Use void_zero_node instead of error_mark_node as a placeholder.
X-Git-Tag: releases/gcc-4.7.0~3096
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3646b46fadff29620b2f188b9f566c95d40c580;p=thirdparty%2Fgcc.git

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 aac66d540b41..0edf96641f67 100644
--- 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 1632c01ebce3..bbe113980e09 100644
--- 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);