procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/58466 (ICE in cxx_eval_constant_expression)

Browse source 
PR c++/58466
	* pt.c (unify_pack_expansion): Call expand_template_argument_pack.

From-SVN: r207283
This commit is contained in:
Jason Merrill 2014-01-29 15:54:21 -05:00 • committed by Jason Merrill
parent 1200933ccc
commit 434e6c8a7c
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/ChangeLog
View file

@ -1,5 +1,8 @@
2014-01-29 Jason Merrill <jason@redhat.com>
PR c++/58466
* pt.c (unify_pack_expansion): Call expand_template_argument_pack.
PR c++/59956
* friend.c (do_friend): Pass the TEMPLATE_DECL to add_friend if we
have a friend template in a class template.

3
gcc/cp/pt.c
View file

@ -16897,6 +16897,9 @@ unify_pack_expansion (tree tparms, tree targs, tree packed_parms,
tree pattern = PACK_EXPANSION_PATTERN (parm);
tree pack, packs = NULL_TREE;
int i, start = TREE_VEC_LENGTH (packed_parms) - 1;
packed_args = expand_template_argument_pack (packed_args);
int len = TREE_VEC_LENGTH (packed_args);
/* Determine the parameter packs we will be deducing from the

10
gcc/testsuite/g++.dg/cpp0x/variadic147.C Normal file
View file

@ -0,0 +1,10 @@
// PR c++/58466
// { dg-require-effective-target c++11 }
template<char, char...> struct A;
template<typename> struct B;
template<char... C> struct B<A<C...>> {};
B<A<'X'>> b;