diff options
| author | Jason Merrill <jason@redhat.com> | 2017-02-20 01:05:38 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-02-20 01:05:38 -0500 |
| commit | 4cd159317cb88496122bd3999a04c56c513bd915 (patch) | |
| tree | ff7efd0f2974d9bdce317dc8faede16c6ebfa38d /gcc | |
| parent | cfb825648d585d15149c8e7658757ae9fc402b33 (diff) | |
| download | gcc-4cd159317cb88496122bd3999a04c56c513bd915.zip gcc-4cd159317cb88496122bd3999a04c56c513bd915.tar.gz gcc-4cd159317cb88496122bd3999a04c56c513bd915.tar.bz2 | |
PR c++/79470 - partial ordering with reference parameters
* pt.c (unify) [INDIRECT_REF]: Handle pack expansions.
From-SVN: r245589
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic-ref1.C | 10 |
3 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ee222b4..033831d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2017-02-19 Jason Merrill <jason@redhat.com> + PR c++/79470 - partial ordering with reference parameters + * pt.c (unify) [INDIRECT_REF]: Handle pack expansions. + PR c++/79500 - ICE with non-template deduction guide * pt.c (do_class_deduction): Use STRIP_TEMPLATE rather than DECL_TEMPLATE_RESULT. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 46e6498..0a9f5d5 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -20918,8 +20918,13 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, case INDIRECT_REF: if (REFERENCE_REF_P (parm)) { + bool pexp = PACK_EXPANSION_P (arg); + if (pexp) + arg = PACK_EXPANSION_PATTERN (arg); if (REFERENCE_REF_P (arg)) arg = TREE_OPERAND (arg, 0); + if (pexp) + arg = make_pack_expansion (arg); return unify (tparms, targs, TREE_OPERAND (parm, 0), arg, strict, explain_p); } diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ref1.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ref1.C new file mode 100644 index 0000000..441d386 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ref1.C @@ -0,0 +1,10 @@ +// PR c++/79470 +// { dg-do compile { target c++11 } } + + template < const int&... > struct AA; + + template < > struct AA<> { }; + + template < const int& II, const int&... Is > + struct AA<II,Is...> { }; + |