diff options
| author | Jason Merrill <jason@redhat.com> | 2014-02-26 12:01:12 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-02-26 12:01:12 -0500 |
| commit | f3417723b7829dda4e795a4cbff2765553667b5a (patch) | |
| tree | 03e76a3b7aa1ace572f037043bac77937a54a005 /gcc | |
| parent | 1bd3ed56ef1ac3a9147ff6384f66487c571dbc86 (diff) | |
| download | gcc-f3417723b7829dda4e795a4cbff2765553667b5a.zip gcc-f3417723b7829dda4e795a4cbff2765553667b5a.tar.gz gcc-f3417723b7829dda4e795a4cbff2765553667b5a.tar.bz2 | |
re PR c++/60182 (g++ segfault within template expansion using "using" aliasing)
PR c++/60182
* pt.c (unify): Ignore alias templates when deducing a template
template parameter.
From-SVN: r208177
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/alias-decl-41.C | 18 |
3 files changed, 25 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ce6085d..b2e687c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2014-02-26 Jason Merrill <jason@redhat.com> + PR c++/60182 + * pt.c (unify): Ignore alias templates when deducing a template + template parameter. + PR c++/60345 Revert: DR 1571 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4a9fa71..d723311 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -17390,9 +17390,11 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, if (TREE_CODE (arg) != BOUND_TEMPLATE_TEMPLATE_PARM && !CLASSTYPE_SPECIALIZATION_OF_PRIMARY_TEMPLATE_P (arg)) return unify_template_deduction_failure (explain_p, parm, arg); - { tree parmvec = TYPE_TI_ARGS (parm); + /* An alias template name is never deduced. */ + if (TYPE_ALIAS_P (arg)) + arg = strip_typedefs (arg); tree argvec = INNERMOST_TEMPLATE_ARGS (TYPE_TI_ARGS (arg)); tree full_argvec = add_to_template_args (targs, argvec); tree parm_parms diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-41.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-41.C new file mode 100644 index 0000000..c444217 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-41.C @@ -0,0 +1,18 @@ +// PR c++/60182 +// { dg-require-effective-target c++11 } + +class B {}; +template <typename> using __allocator_base = B; +template <typename> class F : __allocator_base<int> {}; +class C {}; +template <typename, typename = F<int> > class G : C {}; +template <typename> class D; +class A { + using Container = G<D<char>>; + A(); + A(D<char> const &); + Container m_elements; +}; +template <template <class, class> class C, class A = F<D<int>>> +void doSomething(C<D<char>, A> &); +A::A(D<char> const &) : A() { doSomething(m_elements); } |