OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/58119 (Invalid ambiguous default type conversion with only a single invalid conversion listed.) 

PR c++/58119
	* cp-tree.h (WILDCARD_TYPE_P): Split out from...
	(MAYBE_CLASS_TYPE_P): ...here.
	* cvt.c (build_expr_type_conversion): Don't complain about a
	template that can't match the desired type category.

From-SVN: r201881
This commit is contained in:
Jason Merrill 2013-08-20 08:59:24 -04:00 committed by Jason Merrill
parent da1fdfa8f9
commit 5e7d7fee28
4 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2013-08-20 Jason Merrill <jason@redhat.com>
PR c++/58119
* cp-tree.h (WILDCARD_TYPE_P): Split out from...
(MAYBE_CLASS_TYPE_P): ...here.
* cvt.c (build_expr_type_conversion): Don't complain about a
template that can't match the desired type category.
2012-12-03 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/54170

17
gcc/cp/cp-tree.h
View File

@ -1191,17 +1191,20 @@ enum languages { lang_c, lang_cplusplus, lang_java };
/* The _DECL for this _TYPE. */
#define TYPE_MAIN_DECL(NODE) (TYPE_STUB_DECL (TYPE_MAIN_VARIANT (NODE)))
/* Nonzero if T is a class (or struct or union) type. Also nonzero
for template type parameters, typename types, and instantiated
template template parameters. Keep these checks in ascending code
order. */
#define MAYBE_CLASS_TYPE_P(T) \
/* Nonzero if T is a type that could resolve to any kind of concrete type
at instantiation time. */
#define WILDCARD_TYPE_P(T) \
(TREE_CODE (T) == TEMPLATE_TYPE_PARM \
|| TREE_CODE (T) == TYPENAME_TYPE \
|| TREE_CODE (T) == TYPEOF_TYPE \
|| TREE_CODE (T) == BOUND_TEMPLATE_TEMPLATE_PARM \
|| TREE_CODE (T) == DECLTYPE_TYPE \
|| CLASS_TYPE_P (T))
|| TREE_CODE (T) == DECLTYPE_TYPE)
/* Nonzero if T is a class (or struct or union) type. Also nonzero
for template type parameters, typename types, and instantiated
template template parameters. Keep these checks in ascending code
order. */
#define MAYBE_CLASS_TYPE_P(T) (WILDCARD_TYPE_P (T) || CLASS_TYPE_P (T))
/* Set CLASS_TYPE_P for T to VAL. T must be a class, struct, or
union type. */

23
gcc/cp/cvt.c
View File

@ -1539,17 +1539,6 @@ build_expr_type_conversion (int desires, tree expr, bool complain)
if (DECL_NONCONVERTING_P (cand))
continue;
if (TREE_CODE (cand) == TEMPLATE_DECL)
{
if (complain)
{
error ("ambiguous default type conversion from %qT",
basetype);
error (" candidate conversions include %qD", cand);
}
return error_mark_node;
}
candidate = non_reference (TREE_TYPE (TREE_TYPE (cand)));
switch (TREE_CODE (candidate))
@ -1583,11 +1572,23 @@ build_expr_type_conversion (int desires, tree expr, bool complain)
break;
default:
/* A wildcard could be instantiated to match any desired
type, but we can't deduce the template argument. */
if (WILDCARD_TYPE_P (candidate))
win = true;
break;
}
if (win)
{
if (TREE_CODE (cand) == TEMPLATE_DECL)
{
if (complain)
error ("default type conversion can't deduce template"
" argument for %qD", cand);
return error_mark_node;
}
if (winner)
{
if (complain)

26
gcc/testsuite/g++.dg/template/delete2.C Normal file
View File

@ -0,0 +1,26 @@
// PR c++/58119
template <class T>
struct A
{
operator T*();
template <class U>
operator A<U>();
};
template <class T>
struct B
{
operator T*();
template <class U>
operator A<U>*();
};
int main()
{
A<int> a;
delete a;
B<int> b;
delete b; // { dg-error "template|delete" }
}