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

re PR c++/59707 (Crash when using std::map with template class)

Browse Source 
PR c++/59707
	* call.c (add_builtin_candidate): Catch dependent types.

From-SVN: r207295
This commit is contained in:
Jason Merrill 2014-01-30 00:28:52 -05:00 committed by Jason Merrill
parent 3b16363e1a
commit 3c4e06c27a
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2014-01-29 Jason Merrill <jason@redhat.com>
PR c++/59707
* call.c (add_builtin_candidate): Catch dependent types.
PR c++/59989
* pt.c (expand_template_argument_pack): Correct
non_default_args_count calculation.

29
gcc/cp/call.c
View File

@ -2329,7 +2329,6 @@ add_builtin_candidate (struct z_candidate **candidates, enum tree_code code,
case INDIRECT_REF:
if (TYPE_PTR_P (type1)
&& !uses_template_parms (TREE_TYPE (type1))
&& (TYPE_PTROB_P (type1)
|| TREE_CODE (TREE_TYPE (type1)) == FUNCTION_TYPE))
break;
@ -2467,15 +2466,13 @@ add_builtin_candidate (struct z_candidate **candidates, enum tree_code code,
&& TREE_CODE (type2) == ENUMERAL_TYPE)
break;
if (TYPE_PTR_P (type1)
&& null_ptr_cst_p (args[1])
&& !uses_template_parms (type1))
&& null_ptr_cst_p (args[1]))
{
type2 = type1;
break;
}
if (null_ptr_cst_p (args[0])
&& TYPE_PTR_P (type2)
&& !uses_template_parms (type2))
&& TYPE_PTR_P (type2))
{
type1 = type2;
break;
@ -2642,6 +2639,28 @@ add_builtin_candidate (struct z_candidate **candidates, enum tree_code code,
gcc_unreachable ();
}
/* Make sure we don't create builtin candidates with dependent types. */
bool u1 = uses_template_parms (type1);
bool u2 = type2 ? uses_template_parms (type2) : false;
if (u1 || u2)
{
/* Try to recover if one of the types is non-dependent. But if
there's only one type, there's nothing we can do. */
if (!type2)
return;
/* And we lose if both are dependent. */
if (u1 && u2)
return;
/* Or if they have different forms. */
if (TREE_CODE (type1) != TREE_CODE (type2))
return;
if (u1 && !u2)
type1 = type2;
else if (u2 && !u1)
type2 = type1;
}
/* If we're dealing with two pointer types or two enumeral types,
we need candidates for both of them. */
if (type2 && !same_type_p (type1, type2)

9
gcc/testsuite/g++.dg/template/operator12.C Normal file
View File

@ -0,0 +1,9 @@
// PR c++/59707
struct T {
template<class D> operator D*() const;
};
void f(T x) {
x < x; // { dg-error "no match" }
}