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
This commit is contained in:
Jason Merrill 2011-10-14 15:12:33 -04:00 committed by Jason Merrill
parent 6fd7dd5719
commit c3646b46fa
2 changed files with 7 additions and 2 deletions

View File

@ -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

View File

@ -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);