mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-01 20:21:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

pt.c (instantiate_template_1): Keep processing_template_decl set if there are dependent args.

Browse Source 
* pt.c (instantiate_template_1): Keep processing_template_decl set
	if there are dependent args.

From-SVN: r190825
This commit is contained in:
Jason Merrill 2012-08-30 22:49:33 -04:00 committed by Jason Merrill
parent da4aca78cf
commit 429f8106ec
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2012-08-30 Jason Merrill <jason@redhat.com>
* pt.c (instantiate_template_1): Keep processing_template_decl set
if there are dependent args.
2012-08-25 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51421

4
gcc/cp/pt.c
View File

@ -14373,6 +14373,10 @@ instantiate_template_1 (tree tmpl, tree orig_args, tsubst_flags_t complain)
/* Instantiation of the function happens in the context of the function
template, not the context of the overload resolution we're doing. */
push_to_top_level ();
/* If there are dependent arguments, e.g. because we're doing partial
ordering, make sure processing_template_decl stays set. */
if (uses_template_parms (targ_ptr))
++processing_template_decl;
if (DECL_CLASS_SCOPE_P (gen_tmpl))
{
tree ctx = tsubst (DECL_CONTEXT (gen_tmpl), targ_ptr,