Skip to content

R
riscv-gcc-1
Commit ef768ba3 by Jason Merrill Committed by Jason Merrill
Options

* pt.c (instantiate_template_1): Use tsubst_aggr_type for context. 

From-SVN: r217716
parent 59f1d0db
Showing with 4 additions and 2 deletions
gcc/cp/ChangeLog
2014-11-18 Jason Merrill <jason@redhat.com> 2014-11-18 Jason Merrill <jason@redhat.com>
* pt.c (instantiate_template_1): Use tsubst_aggr_type for context.
PR c++/58102 PR c++/58102
* typeck2.c (store_init_value): Set it. * typeck2.c (store_init_value): Set it.
* cp-tree.h (CONSTRUCTOR_MUTABLE_POISON): New. * cp-tree.h (CONSTRUCTOR_MUTABLE_POISON): New.
......
gcc/cp/pt.c
...@@ -15856,8 +15856,8 @@ instantiate_template_1 (tree tmpl, tree orig_args, tsubst_flags_t complain) ...@@ -15856,8 +15856,8 @@ instantiate_template_1 (tree tmpl, tree orig_args, tsubst_flags_t complain)
++processing_template_decl; ++processing_template_decl;
if (DECL_CLASS_SCOPE_P (gen_tmpl)) if (DECL_CLASS_SCOPE_P (gen_tmpl))
{ {
tree ctx = tsubst (DECL_CONTEXT (gen_tmpl), targ_ptr, tree ctx = tsubst_aggr_type (DECL_CONTEXT (gen_tmpl), targ_ptr,
complain, gen_tmpl); complain, gen_tmpl, true);
push_nested_class (ctx); push_nested_class (ctx);
} }
/* Substitute template parameters to obtain the specialization. */ /* Substitute template parameters to obtain the specialization. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment