mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-09 04:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

call.c (any_strictly_viable): New.

Browse Source 
* call.c (any_strictly_viable): New.
(build_new_op): Use it for COMPOUND_EXPR and ADDR_EXPRs.

From-SVN: r53656
This commit is contained in:
Alexandre Oliva 2002-05-20 10:31:38 +00:00 committed by Alexandre Oliva
parent c0fe508e8b
commit ecc42c14a7
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2002-05-20 Alexandre Oliva <aoliva@redhat.com>
* call.c (any_strictly_viable): New.
(build_new_op): Use it for COMPOUND_EXPR and ADDR_EXPRs.
2002-05-19 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
* error.c (dump_type) [TYPEOF_TYPE]: Fix parenthesis printing.

32
gcc/cp/call.c
View File

@ -62,6 +62,7 @@ static void print_z_candidates PARAMS ((struct z_candidate *));
static tree build_this PARAMS ((tree));
static struct z_candidate * splice_viable PARAMS ((struct z_candidate *));
static int any_viable PARAMS ((struct z_candidate *));
static int any_strictly_viable PARAMS ((struct z_candidate *));
static struct z_candidate * add_template_candidate
PARAMS ((struct z_candidate *, tree, tree, tree, tree, tree, int,
unification_kind_t));
@ -2319,6 +2320,16 @@ any_viable (cands)
return 0;
}
static int
any_strictly_viable (cands)
struct z_candidate *cands;
{
for (; cands; cands = cands->next)
if (cands->viable == 1)
return 1;
return 0;
}
static struct z_candidate *
splice_viable (cands)
struct z_candidate *cands;
@ -3228,6 +3239,7 @@ build_new_op (code, flags, arg1, arg2, arg3)
enum tree_code code2 = NOP_EXPR;
tree templates = NULL_TREE;
tree conv;
bool viable_candidates;
if (arg1 == error_mark_node
|| arg2 == error_mark_node
@ -3392,7 +3404,25 @@ build_new_op (code, flags, arg1, arg2, arg3)
(candidates, code, code2, fnname, args, flags);
}
if (! any_viable (candidates))
switch (code)
{
case COMPOUND_EXPR:
case ADDR_EXPR:
/* For these, the built-in candidates set is empty
[over.match.oper]/3. We don't want non-strict matches
because exact matches are always possible with built-in
operators. The built-in candidate set for COMPONENT_REF
would be empty too, but since there are no such built-in
operators, we accept non-strict matches for them. */
viable_candidates = any_strictly_viable (candidates);
break;
default:
viable_candidates = any_viable (candidates);
break;
}
if (! viable_candidates)
{
switch (code)
{