diff options
| author | Jason Merrill <jason@redhat.com> | 2014-01-29 15:54:21 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-01-29 15:54:21 -0500 |
| commit | 434e6c8a7c07fef86ddb2347b06017fd469aebf7 (patch) | |
| tree | 2d7813a44b04c2cef839d14bbd20af18d0e4c901 | |
| parent | 1200933cccdd1bbab4758560f36809f46434294a (diff) | |
| download | gcc-434e6c8a7c07fef86ddb2347b06017fd469aebf7.zip gcc-434e6c8a7c07fef86ddb2347b06017fd469aebf7.tar.gz gcc-434e6c8a7c07fef86ddb2347b06017fd469aebf7.tar.bz2 | |
re PR c++/58466 (ICE in cxx_eval_constant_expression)
PR c++/58466
* pt.c (unify_pack_expansion): Call expand_template_argument_pack.
From-SVN: r207283
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic147.C | 10 |
3 files changed, 16 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 723ce95..e24a9ae 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 943255d..9be9171 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -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 diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic147.C b/gcc/testsuite/g++.dg/cpp0x/variadic147.C new file mode 100644 index 0000000..7f606d8 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic147.C @@ -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; |