diff options
| author | Jason Merrill <jason@redhat.com> | 2014-11-20 19:47:50 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-11-20 19:47:50 -0500 |
| commit | a663ce5a831198b5ef99cbc0b7205a2d9a37a574 (patch) | |
| tree | d1eea4dffcb9657dfe21b9a6e9b9509e2752f8c3 | |
| parent | e4c4792d37be8f7835dac75e929e7011ccba91fa (diff) | |
| download | gcc-a663ce5a831198b5ef99cbc0b7205a2d9a37a574.zip gcc-a663ce5a831198b5ef99cbc0b7205a2d9a37a574.tar.gz gcc-a663ce5a831198b5ef99cbc0b7205a2d9a37a574.tar.bz2 | |
re PR c++/63658 (Using class reference as template parameter causes compilation to fail)
PR c++/63658
* pt.c (convert_nontype_argument): Call convert_from_reference.
(check_instantiated_arg): Don't be confused by reference refs.
(unify): Look through reference refs on the arg, too.
* mangle.c (write_template_arg): Look through reference refs.
From-SVN: r217900
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/mangle.c | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/ref9.C | 15 |
4 files changed, 31 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 305565f..ee431a1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2014-11-20 Jason Merrill <jason@redhat.com> + PR c++/63658 + * pt.c (convert_nontype_argument): Call convert_from_reference. + (check_instantiated_arg): Don't be confused by reference refs. + (unify): Look through reference refs on the arg, too. + * mangle.c (write_template_arg): Look through reference refs. + * error.c (dump_expr): Avoid printing (*&i) for references. 2014-11-20 Ville Voutilainen <ville.voutilainen@gmail.com> diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 576ad1d..4c63df0 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -3086,6 +3086,8 @@ write_template_arg (tree node) } } + if (REFERENCE_REF_P (node)) + node = TREE_OPERAND (node, 0); if (TREE_CODE (node) == NOP_EXPR && TREE_CODE (TREE_TYPE (node)) == REFERENCE_TYPE) { diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 05ca706..71b7af1 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6174,7 +6174,7 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) right type? */ gcc_assert (same_type_ignoring_top_level_qualifiers_p (type, TREE_TYPE (expr))); - return expr; + return convert_from_reference (expr); } /* Subroutine of coerce_template_template_parms, which returns 1 if @@ -15740,6 +15740,7 @@ check_instantiated_arg (tree tmpl, tree t, tsubst_flags_t complain) constant. */ else if (TREE_TYPE (t) && INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (t)) + && !REFERENCE_REF_P (t) && !TREE_CONSTANT (t)) { if (complain & tf_error) @@ -18473,8 +18474,12 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, case INDIRECT_REF: if (REFERENCE_REF_P (parm)) - return unify (tparms, targs, TREE_OPERAND (parm, 0), arg, - strict, explain_p); + { + if (REFERENCE_REF_P (arg)) + arg = TREE_OPERAND (arg, 0); + return unify (tparms, targs, TREE_OPERAND (parm, 0), arg, + strict, explain_p); + } /* FALLTHRU */ default: diff --git a/gcc/testsuite/g++.dg/template/ref9.C b/gcc/testsuite/g++.dg/template/ref9.C new file mode 100644 index 0000000..983f627 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/ref9.C @@ -0,0 +1,15 @@ +// PR c++/63658 + +struct Descriptor {}; + +template <Descriptor & D> +struct foo +{ + void size (); +}; + +Descriptor g_descriptor = {}; + +template<> void foo<g_descriptor>::size() +{ +} |