From c3646b46fadff29620b2f188b9f566c95d40c580 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 14 Oct 2011 15:12:33 -0400 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aac66d540b4..0edf96641f6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-10-14 Jason Merrill + + * pt.c (tsubst_decl) [FIELD_DECL]: Use void_zero_node + instead of error_mark_node as a placeholder. + 2011-10-14 Paolo Carlini PR c++/38174 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 1632c01ebce..bbe113980e0 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); -- 2.30.2