From 723033a6b2ce651e9fded5af3a820ad605cbfed0 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 12 Jan 2016 09:21:53 +0100 Subject: re PR c++/66808 (tree check fail in symbol_table::decl_assembler_name_hash) PR c++/66808 PR c++/69000 * pt.c (tsubst_decl): If not local_p, clear DECL_TEMPLATE_INFO. * g++.dg/tls/pr66808.C: New test. * g++.dg/tls/pr69000.C: New test. From-SVN: r232259 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/pt.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ba7cf58..c8b8160 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-01-12 Jakub Jelinek + + PR c++/66808 + PR c++/69000 + * pt.c (tsubst_decl): If not local_p, clear DECL_TEMPLATE_INFO. + 2016-01-11 Jason Merrill PR c++/69131 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index ad5099f..edec774 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -12292,8 +12292,13 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) SET_DECL_IMPLICIT_INSTANTIATION (r); register_specialization (r, gen_tmpl, argvec, false, hash); } - else if (!cp_unevaluated_operand) - register_local_specialization (r, t); + else + { + if (DECL_LANG_SPECIFIC (r)) + DECL_TEMPLATE_INFO (r) = NULL_TREE; + if (!cp_unevaluated_operand) + register_local_specialization (r, t); + } DECL_CHAIN (r) = NULL_TREE; -- cgit v1.1