OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/38543 ([C++0x] Cannot specialize variadic template function) 

PR c++/38543
	* pt.c (determine_specialization): Instead of comparing the number
	of parms, check that tsubst gives the right answer.

From-SVN: r186533
This commit is contained in:
Jason Merrill 2012-04-17 10:11:34 -04:00 committed by Jason Merrill
parent 71b17ff5fc
commit 60759aaa63
4 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2012-04-16 Jason Merrill <jason@redhat.com>
PR c++/38543
* pt.c (determine_specialization): Instead of comparing the number
of parms, check that tsubst gives the right answer.
PR c++/50830
* pt.c (convert_template_argument): Handle template template
argument packs.

16
gcc/cp/pt.c
View File

@ -1860,6 +1860,7 @@ determine_specialization (tree template_id,
{
tree decl_arg_types;
tree fn_arg_types;
tree insttype;
/* In case of explicit specialization, we need to check if
the number of template headers appearing in the specialization
@ -1927,7 +1928,8 @@ determine_specialization (tree template_id,
template <> void f<int>();
The specialization f<int> is invalid but is not caught
by get_bindings below. */
if (list_length (fn_arg_types) != list_length (decl_arg_types))
if (cxx_dialect < cxx11
&& list_length (fn_arg_types) != list_length (decl_arg_types))
continue;
/* Function templates cannot be specializations; there are
@ -1950,6 +1952,18 @@ determine_specialization (tree template_id,
specialize TMPL will produce DECL. */
continue;
if (cxx_dialect >= cxx11)
{
/* Make sure that the deduced arguments actually work. */
insttype = tsubst (TREE_TYPE (fn), targs, tf_none, NULL_TREE);
if (insttype == error_mark_node)
continue;
fn_arg_types
= skip_artificial_parms_for (fn, TYPE_ARG_TYPES (insttype));
if (!compparms (fn_arg_types, decl_arg_types))
continue;
}
/* Save this template, and the arguments deduced. */
templates = tree_cons (targs, fn, templates);
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-16 Jason Merrill <jason@redhat.com>
PR c++/38543
* g++.dg/cpp0x/variadic131.C: New.
2012-04-16 Jason Merrill <jason@redhat.com>
PR c++/50830

11
gcc/testsuite/g++.dg/cpp0x/variadic131.C Normal file
View File

@ -0,0 +1,11 @@
// PR c++/38543
// { dg-do compile { target c++11 } }
template< typename ... T > void foo( T ... args );
template<> void foo( ){}
template<> void foo(int,double){}
int main()
{
foo( 0, 0.0 );
return 55;
}