Skip to content

R
riscv-gcc-1
Commit 8d857afc by Jason Merrill Committed by Jason Merrill
Options

* pt.c (instantiate_decl): Avoid recalculation. 

From-SVN: r236947
parent 1f032c53
Showing with 6 additions and 6 deletions
gcc/cp/ChangeLog
2016-05-31 Jason Merrill <jason@redhat.com> 2016-05-31 Jason Merrill <jason@redhat.com>
* pt.c (instantiate_decl): Avoid recalculation.
PR c++/60095 PR c++/60095
PR c++/69515 PR c++/69515
PR c++/69009 PR c++/69009
......
gcc/cp/pt.c
...@@ -21971,7 +21971,6 @@ instantiate_decl (tree d, int defer_ok, ...@@ -21971,7 +21971,6 @@ instantiate_decl (tree d, int defer_ok,
else if (TREE_CODE (d) == FUNCTION_DECL) else if (TREE_CODE (d) == FUNCTION_DECL)
{ {
hash_map<tree, tree> *saved_local_specializations; hash_map<tree, tree> *saved_local_specializations;
tree subst_decl;
tree tmpl_parm; tree tmpl_parm;
tree spec_parm; tree spec_parm;
tree block = NULL_TREE; tree block = NULL_TREE;
...@@ -21994,18 +21993,17 @@ instantiate_decl (tree d, int defer_ok, ...@@ -21994,18 +21993,17 @@ instantiate_decl (tree d, int defer_ok,
access checked at template instantiation time, i.e now. These access checked at template instantiation time, i.e now. These
types were added to the template at parsing time. Let's get those types were added to the template at parsing time. Let's get those
and perform the access checks then. */ and perform the access checks then. */
perform_typedefs_access_check (DECL_TEMPLATE_RESULT (gen_tmpl), perform_typedefs_access_check (DECL_TEMPLATE_RESULT (td),
gen_args); args);
/* Create substitution entries for the parameters. */ /* Create substitution entries for the parameters. */
subst_decl = DECL_TEMPLATE_RESULT (template_for_substitution (d)); tmpl_parm = DECL_ARGUMENTS (code_pattern);
tmpl_parm = DECL_ARGUMENTS (subst_decl);
spec_parm = DECL_ARGUMENTS (d); spec_parm = DECL_ARGUMENTS (d);
if (DECL_NONSTATIC_MEMBER_FUNCTION_P (d)) if (DECL_NONSTATIC_MEMBER_FUNCTION_P (d))
{ {
register_local_specialization (spec_parm, tmpl_parm); register_local_specialization (spec_parm, tmpl_parm);
spec_parm = skip_artificial_parms_for (d, spec_parm); spec_parm = skip_artificial_parms_for (d, spec_parm);
tmpl_parm = skip_artificial_parms_for (subst_decl, tmpl_parm); tmpl_parm = skip_artificial_parms_for (code_pattern, tmpl_parm);
} }
for (; tmpl_parm; tmpl_parm = DECL_CHAIN (tmpl_parm)) for (; tmpl_parm; tmpl_parm = DECL_CHAIN (tmpl_parm))
{ {
......
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