From bbe61471dd42ded6e59bcf66de859cc7708fd7e6 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 11 Sep 2007 11:40:51 -0400 Subject: [PATCH] re PR c++/31419 (template user defined conversion operator instantiated for conversion to self) PR c++/31419 * call.c (reference_binding): Don't look for user-defined conversions to the same type. From-SVN: r128383 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/call.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 897e9e3e705b..e975e4b17927 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2007-09-11 Jason Merrill + PR c++/31419 + * call.c (reference_binding): Don't look for user-defined conversions + to the same type. + PR c++/15745 * except.c (prepare_eh_type): Use type_decays_to. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index c67e844d7fed..891ebb96829c 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -1153,7 +1153,12 @@ reference_binding (tree rto, tree rfrom, tree expr, bool c_cast_p, int flags) return conv; } - else if (CLASS_TYPE_P (from) && !(flags & LOOKUP_NO_CONVERSION)) + /* [class.conv.fct] A conversion function is never used to convert a + (possibly cv-qualified) object to the (possibly cv-qualified) same + object type (or a reference to it), to a (possibly cv-qualified) base + class of that type (or a reference to it).... */ + else if (CLASS_TYPE_P (from) && !related_p + && !(flags & LOOKUP_NO_CONVERSION)) { /* [dcl.init.ref] -- 2.47.2