mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 13:51:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/60182 (g++ segfault within template expansion using "using" aliasing)

Browse Source 
PR c++/60182
	* pt.c (unify): Ignore alias templates when deducing a template
	template parameter.

From-SVN: r208177
This commit is contained in:
Jason Merrill 2014-02-26 12:01:12 -05:00 committed by Jason Merrill
parent 1bd3ed56ef
commit f3417723b7
3 changed files with 25 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 @@
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

4
gcc/cp/pt.c
View File

@ -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

18
gcc/testsuite/g++.dg/cpp0x/alias-decl-41.C Normal file
View File

@ -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); }