diff options
| author | Jason Merrill <jason@redhat.com> | 2014-11-18 09:36:48 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-11-18 09:36:48 -0500 |
| commit | ef768ba35319435af3fcf4171253dd32a6ecc322 (patch) | |
| tree | 4390aadde644decfb75fbbfbd4f646dda2c72d16 | |
| parent | 59f1d0db7ae9ccc8049eb2933ff631dab77e1c17 (diff) | |
| download | gcc-ef768ba35319435af3fcf4171253dd32a6ecc322.zip gcc-ef768ba35319435af3fcf4171253dd32a6ecc322.tar.gz gcc-ef768ba35319435af3fcf4171253dd32a6ecc322.tar.bz2 | |
* pt.c (instantiate_template_1): Use tsubst_aggr_type for context.
From-SVN: r217716
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1afd3cf..1173559 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2014-11-18 Jason Merrill <jason@redhat.com> + * pt.c (instantiate_template_1): Use tsubst_aggr_type for context. + PR c++/58102 * typeck2.c (store_init_value): Set it. * cp-tree.h (CONSTRUCTOR_MUTABLE_POISON): New. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c0f3b8c..6661325 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15856,8 +15856,8 @@ instantiate_template_1 (tree tmpl, tree orig_args, tsubst_flags_t complain) ++processing_template_decl; if (DECL_CLASS_SCOPE_P (gen_tmpl)) { - tree ctx = tsubst (DECL_CONTEXT (gen_tmpl), targ_ptr, - complain, gen_tmpl); + tree ctx = tsubst_aggr_type (DECL_CONTEXT (gen_tmpl), targ_ptr, + complain, gen_tmpl, true); push_nested_class (ctx); } /* Substitute template parameters to obtain the specialization. */ |