diff options
| author | Jason Merrill <jason@redhat.com> | 2011-10-14 15:12:33 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-10-14 15:12:33 -0400 |
| commit | c3646b46fadff29620b2f188b9f566c95d40c580 (patch) | |
| tree | b0dbd3f62175a19e9ac7bdb0739ac5d5253e2a64 | |
| parent | 6fd7dd571975911d0f8cafe6660c0ab2608d3143 (diff) | |
| download | gcc-c3646b46fadff29620b2f188b9f566c95d40c580.zip gcc-c3646b46fadff29620b2f188b9f566c95d40c580.tar.gz gcc-c3646b46fadff29620b2f188b9f566c95d40c580.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aac66d5..0edf966 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 1632c01..bbe1139 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); |