mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-18 05:58:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* call.c (joust): Remove COND_EXPR hack.

Browse Source 
From-SVN: r47346
This commit is contained in:
Jason Merrill 2001-11-26 08:11:15 -05:00 committed by Jason Merrill
parent 5bc72aebcb
commit 5b0c589655
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2001-11-26 Jason Merrill <jason@redhat.com>
* call.c (joust): Remove COND_EXPR hack.
2001-11-25 Aldy Hernandez <aldyh@redhat.com> 2001-11-25 Aldy Hernandez <aldyh@redhat.com>
* cp/search.c (lookup_base_r): Declare bk in variable declaration * cp/search.c (lookup_base_r): Declare bk in variable declaration

22
gcc/cp/call.c
View File

@ -1933,7 +1933,7 @@ add_builtin_candidate (candidates, code, code2, fnname, type1, type2,
break; break;
case COND_EXPR: case COND_EXPR:
/* [over.builtin] /* [over.built]
For every pair of promoted arithmetic types L and R, there For every pair of promoted arithmetic types L and R, there
exist candidate operator functions of the form exist candidate operator functions of the form
@ -5413,26 +5413,6 @@ joust (cand1, cand2, warn)
/* cand2 is built-in; prefer cand1. */ /* cand2 is built-in; prefer cand1. */
return 1; return 1;
} }
/* Kludge around broken overloading rules whereby
Integer a, b; test ? a : b; is ambiguous, since there's a builtin
that takes references and another that takes values. */
if (cand1->fn == cand2->fn
&& cand1->fn == ansi_opname (COND_EXPR))
{
tree c1 = TREE_VEC_ELT (cand1->convs, 1);
tree c2 = TREE_VEC_ELT (cand2->convs, 1);
tree t1 = strip_top_quals (non_reference (TREE_TYPE (c1)));
tree t2 = strip_top_quals (non_reference (TREE_TYPE (c2)));
if (same_type_p (t1, t2))
{
if (TREE_CODE (c1) == REF_BIND && TREE_CODE (c2) != REF_BIND)
return 1;
if (TREE_CODE (c1) != REF_BIND && TREE_CODE (c2) == REF_BIND)
return -1;
}
}
} }
/* If the two functions are the same (this can happen with declarations /* If the two functions are the same (this can happen with declarations