OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR c++/13225 

* eval.c (evaluate_subexp_standard): Do not construct
	an array of types; pass the value array directly to
	find_overload_match.
	* gdbtypes.h (NULL_POINTER_CONVERSION_BADNESS): Declare.
	(rank_function): Take an array of values instead of types.
	(rank_one_type): Add struct value * parameter.
	* gdbtypes.c (NULL_POINTER_CONVERSION_BADNESS): Define.
	(rank_function): For each argument, pass the argument's
	value to rank_one_type.
	(rank_one_type): Add VALUE parameter.
	If the parameter type is a pointer and the argument type
	is an integer, return NULL_POINTER_CONVERSION_BADNESS if
	VALUE is zero.
	Update all calls to rank_one_type, passing NULL for new
	VALUE parameter.
	* valarith.c (value_user_defined_cpp_op): Do not construct
	an array of types; pass the value array directly to
	find_overload_match.
	* valops.c (find_overload_method_list): Take an array of
	values instead of types.
	Save the type of OBJP for later use.
	Update calls to find_oload_champ, and find_oload_champ_namespace.
	(find_oload_champ_namespace): Take an array of values instead
	of types.
	(find_oload_champ_namespace_loop): Likewise.
	(find_oload_champ): Likewise.
	(classify_oload_match): Inspect all arguments
	until INCOMPATIBLE is found. Return the worst badness found
	otherwise.
	(compare_parameters): Update call to rank_one_type.
	* value.h (find_overload_match): Take an array of values instead
	of types.
This commit is contained in:
Keith Seitz 2011-10-14 20:22:17 +00:00
parent 59c0b43d75
commit da096638ca
7 changed files with 104 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gdb/ChangeLog
View File

@ -1,3 +1,39 @@
2011-10-14 Keith Seitz <keiths@redhat.com>
PR c++/13225
* eval.c (evaluate_subexp_standard): Do not construct
an array of types; pass the value array directly to
find_overload_match.
* gdbtypes.h (NULL_POINTER_CONVERSION_BADNESS): Declare.
(rank_function): Take an array of values instead of types.
(rank_one_type): Add struct value * parameter.
* gdbtypes.c (NULL_POINTER_CONVERSION_BADNESS): Define.
(rank_function): For each argument, pass the argument's
value to rank_one_type.
(rank_one_type): Add VALUE parameter.
If the parameter type is a pointer and the argument type
is an integer, return NULL_POINTER_CONVERSION_BADNESS if
VALUE is zero.
Update all calls to rank_one_type, passing NULL for new
VALUE parameter.
* valarith.c (value_user_defined_cpp_op): Do not construct
an array of types; pass the value array directly to
find_overload_match.
* valops.c (find_overload_method_list): Take an array of
values instead of types.
Save the type of OBJP for later use.
Update calls to find_oload_champ, and find_oload_champ_namespace.
(find_oload_champ_namespace): Take an array of values instead
of types.
(find_oload_champ_namespace_loop): Likewise.
(find_oload_champ): Likewise.
(classify_oload_match): Inspect all arguments
until INCOMPATIBLE is found. Return the worst badness found
otherwise.
(compare_parameters): Update call to rank_one_type.
* value.h (find_overload_match): Take an array of values instead
of types.
2011-10-14 Jan Kratochvil <jan.kratochvil@redhat.com>
Drop lazy lm_info reading.

24
gdb/eval.c
View File

@ -1674,13 +1674,7 @@ evaluate_subexp_standard (struct type *expect_type,
func_name = (char *) alloca (name_len + 1);
strcpy (func_name, &exp->elts[string_pc + 1].string);
/* Prepare list of argument types for overload resolution. */
arg_types = (struct type **)
alloca (nargs * (sizeof (struct type *)));
for (ix = 1; ix <= nargs; ix++)
arg_types[ix - 1] = value_type (argvec[ix]);
find_overload_match (arg_types, nargs, func_name,
find_overload_match (&argvec[1], nargs, func_name,
NON_METHOD, /* not method */
0, /* strict match */
NULL, NULL, /* pass NULL symbol since
@ -1716,13 +1710,7 @@ evaluate_subexp_standard (struct type *expect_type,
evaluation. */
struct value *valp = NULL;
/* Prepare list of argument types for overload resolution. */
arg_types = (struct type **)
alloca (nargs * (sizeof (struct type *)));
for (ix = 1; ix <= nargs; ix++)
arg_types[ix - 1] = value_type (argvec[ix]);
(void) find_overload_match (arg_types, nargs, tstr,
(void) find_overload_match (&argvec[1], nargs, tstr,
METHOD, /* method */
0, /* strict match */
&arg2, /* the object */
@ -1793,13 +1781,7 @@ evaluate_subexp_standard (struct type *expect_type,
if (op == OP_VAR_VALUE)
function = exp->elts[save_pos1+2].symbol;
/* Prepare list of argument types for overload resolution. */
arg_types = (struct type **)
alloca (nargs * (sizeof (struct type *)));
for (ix = 1; ix <= nargs; ix++)
arg_types[ix - 1] = value_type (argvec[ix]);
(void) find_overload_match (arg_types, nargs,
(void) find_overload_match (&argvec[1], nargs,
NULL, /* no need for name */
NON_METHOD, /* not method */
0, /* strict match */

30
gdb/gdbtypes.c
View File

@ -60,7 +60,7 @@ const struct rank VOID_PTR_CONVERSION_BADNESS = {2,0};
const struct rank BOOL_PTR_CONVERSION_BADNESS = {3,0};
const struct rank BASE_CONVERSION_BADNESS = {2,0};
const struct rank REFERENCE_CONVERSION_BADNESS = {2,0};
const struct rank NULL_POINTER_CONVERSION_BADNESS = {2,0};
const struct rank NS_POINTER_CONVERSION_BADNESS = {10,0};
/* Floatformat pairs. */
@ -2283,7 +2283,7 @@ compare_badness (struct badness_vector *a, struct badness_vector *b)
struct badness_vector *
rank_function (struct type **parms, int nparms,
struct type **args, int nargs)
struct value **args, int nargs)
{
int i;
struct badness_vector *bv;
@ -2306,7 +2306,8 @@ rank_function (struct type **parms, int nparms,
/* Now rank all the parameters of the candidate function. */
for (i = 1; i <= min_len; i++)
bv->rank[i] = rank_one_type (parms[i-1], args[i-1]);
bv->rank[i] = rank_one_type (parms[i - 1], value_type (args[i - 1]),
args[i - 1]);
/* If more arguments than parameters, add dummy entries. */
for (i = min_len + 1; i <= nargs; i++)
@ -2405,6 +2406,7 @@ types_equal (struct type *a, struct type *b)
* PARM is intended to be the parameter type of a function; and
* ARG is the supplied argument's type. This function tests if
* the latter can be converted to the former.
* VALUE is the argument's value or NULL if none (or called recursively)
*
* Return 0 if they are identical types;
* Otherwise, return an integer which corresponds to how compatible
@ -2412,7 +2414,7 @@ types_equal (struct type *a, struct type *b)
* Generally the "bad" conversions are all uniformly assigned a 100. */
struct rank
rank_one_type (struct type *parm, struct type *arg)
rank_one_type (struct type *parm, struct type *arg, struct value *value)
{
struct rank rank = {0,0};
@ -2428,10 +2430,10 @@ rank_one_type (struct type *parm, struct type *arg)
/* See through references, since we can almost make non-references
references. */
if (TYPE_CODE (arg) == TYPE_CODE_REF)
return (sum_ranks (rank_one_type (parm, TYPE_TARGET_TYPE (arg)),
return (sum_ranks (rank_one_type (parm, TYPE_TARGET_TYPE (arg), NULL),
REFERENCE_CONVERSION_BADNESS));
if (TYPE_CODE (parm) == TYPE_CODE_REF)
return (sum_ranks (rank_one_type (TYPE_TARGET_TYPE (parm), arg),
return (sum_ranks (rank_one_type (TYPE_TARGET_TYPE (parm), arg, NULL),
REFERENCE_CONVERSION_BADNESS));
if (overload_debug)
/* Debugging only. */
@ -2468,8 +2470,16 @@ rank_one_type (struct type *parm, struct type *arg)
return EXACT_MATCH_BADNESS;
return INCOMPATIBLE_TYPE_BADNESS;
case TYPE_CODE_FUNC:
return rank_one_type (TYPE_TARGET_TYPE (parm), arg);
return rank_one_type (TYPE_TARGET_TYPE (parm), arg, NULL);
case TYPE_CODE_INT:
if (value != NULL && TYPE_CODE (value_type (value)) == TYPE_CODE_INT
&& value_as_long (value) == 0)
{
/* Null pointer conversion: allow it to be cast to a pointer.
[4.10.1 of C++ standard draft n3290] */
return NULL_POINTER_CONVERSION_BADNESS;
}
/* fall through */
case TYPE_CODE_ENUM:
case TYPE_CODE_FLAGS:
case TYPE_CODE_CHAR:
@ -2484,7 +2494,7 @@ rank_one_type (struct type *parm, struct type *arg)
case TYPE_CODE_PTR:
case TYPE_CODE_ARRAY:
return rank_one_type (TYPE_TARGET_TYPE (parm),
TYPE_TARGET_TYPE (arg));
TYPE_TARGET_TYPE (arg), NULL);
default:
return INCOMPATIBLE_TYPE_BADNESS;
}
@ -2492,7 +2502,7 @@ rank_one_type (struct type *parm, struct type *arg)
switch (TYPE_CODE (arg))
{
case TYPE_CODE_PTR: /* funcptr -> func */
return rank_one_type (parm, TYPE_TARGET_TYPE (arg));
return rank_one_type (parm, TYPE_TARGET_TYPE (arg), NULL);
default:
return INCOMPATIBLE_TYPE_BADNESS;
}
@ -2748,7 +2758,7 @@ rank_one_type (struct type *parm, struct type *arg)
/* Not in C++ */
case TYPE_CODE_SET:
return rank_one_type (TYPE_FIELD_TYPE (parm, 0),
TYPE_FIELD_TYPE (arg, 0));
TYPE_FIELD_TYPE (arg, 0), NULL);
default:
return INCOMPATIBLE_TYPE_BADNESS;
}

7
gdb/gdbtypes.h
View File

@ -1555,6 +1555,8 @@ extern const struct rank BOOL_PTR_CONVERSION_BADNESS;
extern const struct rank BASE_CONVERSION_BADNESS;
/* Badness of converting from non-reference to reference. */
extern const struct rank REFERENCE_CONVERSION_BADNESS;
/* Badness of converting integer 0 to NULL pointer. */
extern const struct rank NULL_POINTER_CONVERSION;
/* Non-standard conversions allowed by the debugger */
/* Converting a pointer to an int is usually OK. */
@ -1567,9 +1569,10 @@ extern int compare_ranks (struct rank a, struct rank b);
extern int compare_badness (struct badness_vector *, struct badness_vector *);
extern struct badness_vector *rank_function (struct type **, int,
struct type **, int);
struct value **, int);
extern struct rank rank_one_type (struct type *, struct type *);
extern struct rank rank_one_type (struct type *, struct type *,
struct value *);
extern void recursive_dump_type (struct type *, int);

9
gdb/valarith.c
View File

@ -335,15 +335,8 @@ value_user_defined_cpp_op (struct value **args, int nargs, char *operator,
struct symbol *symp = NULL;
struct value *valp = NULL;
struct type **arg_types;
int i;
arg_types = (struct type **) alloca (nargs * (sizeof (struct type *)));
/* Prepare list of argument types for overload resolution. */
for (i = 0; i < nargs; i++)
arg_types[i] = value_type (args[i]);
find_overload_match (arg_types, nargs, operator, BOTH /* could be method */,
find_overload_match (args, nargs, operator, BOTH /* could be method */,
0 /* strict match */, &args[0], /* objp */
NULL /* pass NULL symbol since symbol is unknown */,
&valp, &symp, static_memfuncp, 0);

61
gdb/valops.c
View File

@ -61,20 +61,20 @@ static struct value *search_struct_method (const char *, struct value **,
struct value **,
int, int *, struct type *);
static int find_oload_champ_namespace (struct type **, int,
static int find_oload_champ_namespace (struct value **, int,
const char *, const char *,
struct symbol ***,
struct badness_vector **,
const int no_adl);
static
int find_oload_champ_namespace_loop (struct type **, int,
int find_oload_champ_namespace_loop (struct value **, int,
const char *, const char *,
int, struct symbol ***,
struct badness_vector **, int *,
const int no_adl);
static int find_oload_champ (struct type **, int, int, int,
static int find_oload_champ (struct value **, int, int, int,
struct fn_field *, struct symbol **,
struct badness_vector **);
@ -2491,7 +2491,7 @@ value_find_oload_method_list (struct value **argp, const char *method,
basetype, boffset);
}
/* Given an array of argument types (ARGTYPES) (which includes an
/* Given an array of arguments (ARGS) (which includes an
entry for "this" in the case of C++ methods), the number of
arguments NARGS, the NAME of a function whether it's a method or
not (METHOD), and the degree of laxness (LAX) in conforming to
@ -2534,13 +2534,14 @@ value_find_oload_method_list (struct value **argp, const char *method,
resolution is permitted. */
int
find_overload_match (struct type **arg_types, int nargs,
find_overload_match (struct value **args, int nargs,
const char *name, enum oload_search_type method,
int lax, struct value **objp, struct symbol *fsym,
struct value **valp, struct symbol **symp,
int *staticp, const int no_adl)
{
struct value *obj = (objp ? *objp : NULL);
struct type *obj_type = obj ? value_type (obj) : NULL;
/* Index of best overloaded function. */
int func_oload_champ = -1;
int method_oload_champ = -1;
@ -2609,7 +2610,7 @@ find_overload_match (struct type **arg_types, int nargs,
if (fns_ptr)
{
gdb_assert (TYPE_DOMAIN_TYPE (fns_ptr[0].type) != NULL);
method_oload_champ = find_oload_champ (arg_types, nargs, method,
method_oload_champ = find_oload_champ (args, nargs, method,
num_fns, fns_ptr,
oload_syms, &method_badness);
@ -2631,7 +2632,8 @@ find_overload_match (struct type **arg_types, int nargs,
and non member function, the first argument must now be
dereferenced. */
if (method == BOTH)
arg_types[0] = TYPE_TARGET_TYPE (arg_types[0]);
deprecated_set_value_type (args[0],
TYPE_TARGET_TYPE (value_type (args[0])));
if (fsym)
{
@ -2677,7 +2679,7 @@ find_overload_match (struct type **arg_types, int nargs,
return 0;
}
func_oload_champ = find_oload_champ_namespace (arg_types, nargs,
func_oload_champ = find_oload_champ_namespace (args, nargs,
func_name,
qualified_name,
&oload_syms,
@ -2781,11 +2783,11 @@ find_overload_match (struct type **arg_types, int nargs,
if (objp)
{
struct type *temp_type = check_typedef (value_type (temp));
struct type *obj_type = check_typedef (value_type (*objp));
struct type *objtype = check_typedef (obj_type);
if (TYPE_CODE (temp_type) != TYPE_CODE_PTR
&& (TYPE_CODE (obj_type) == TYPE_CODE_PTR
|| TYPE_CODE (obj_type) == TYPE_CODE_REF))
&& (TYPE_CODE (objtype) == TYPE_CODE_PTR
|| TYPE_CODE (objtype) == TYPE_CODE_REF))
{
temp = value_addr (temp);
}
@ -2814,7 +2816,7 @@ find_overload_match (struct type **arg_types, int nargs,
performned. */
static int
find_oload_champ_namespace (struct type **arg_types, int nargs,
find_oload_champ_namespace (struct value **args, int nargs,
const char *func_name,
const char *qualified_name,
struct symbol ***oload_syms,
@ -2823,7 +2825,7 @@ find_oload_champ_namespace (struct type **arg_types, int nargs,
{
int oload_champ;
find_oload_champ_namespace_loop (arg_types, nargs,
find_oload_champ_namespace_loop (args, nargs,
func_name,
qualified_name, 0,
oload_syms, oload_champ_bv,
@ -2843,7 +2845,7 @@ find_oload_champ_namespace (struct type **arg_types, int nargs,
*OLOAD_CHAMP_BV. */
static int
find_oload_champ_namespace_loop (struct type **arg_types, int nargs,
find_oload_champ_namespace_loop (struct value **args, int nargs,
const char *func_name,
const char *qualified_name,
int namespace_len,
@ -2880,7 +2882,7 @@ find_oload_champ_namespace_loop (struct type **arg_types, int nargs,
{
searched_deeper = 1;
if (find_oload_champ_namespace_loop (arg_types, nargs,
if (find_oload_champ_namespace_loop (args, nargs,
func_name, qualified_name,
next_namespace_len,
oload_syms, oload_champ_bv,
@ -2909,12 +2911,22 @@ find_oload_champ_namespace_loop (struct type **arg_types, int nargs,
/* If we have reached the deepest level perform argument
determined lookup. */
if (!searched_deeper && !no_adl)
make_symbol_overload_list_adl (arg_types, nargs, func_name);
{
int ix;
struct type **arg_types;
/* Prepare list of argument types for overload resolution. */
arg_types = (struct type **)
alloca (nargs * (sizeof (struct type *)));
for (ix = 0; ix < nargs; ix++)
arg_types[ix] = value_type (args[ix]);
make_symbol_overload_list_adl (arg_types, nargs, func_name);
}
while (new_oload_syms[num_fns])
++num_fns;
new_oload_champ = find_oload_champ (arg_types, nargs, 0, num_fns,
new_oload_champ = find_oload_champ (args, nargs, 0, num_fns,
NULL, new_oload_syms,
&new_oload_champ_bv);
@ -2951,7 +2963,7 @@ find_oload_champ_namespace_loop (struct type **arg_types, int nargs,
}
}
/* Look for a function to take NARGS args of types ARG_TYPES. Find
/* Look for a function to take NARGS args of ARGS. Find
the best match from among the overloaded methods or functions
(depending on METHOD) given by FNS_PTR or OLOAD_SYMS, respectively.
The number of methods/functions in the list is given by NUM_FNS.
@ -2961,7 +2973,7 @@ find_oload_champ_namespace_loop (struct type **arg_types, int nargs,
It is the caller's responsibility to free *OLOAD_CHAMP_BV. */
static int
find_oload_champ (struct type **arg_types, int nargs, int method,
find_oload_champ (struct value **args, int nargs, int method,
int num_fns, struct fn_field *fns_ptr,
struct symbol **oload_syms,
struct badness_vector **oload_champ_bv)
@ -3007,7 +3019,7 @@ find_oload_champ (struct type **arg_types, int nargs, int method,
/* Compare parameter types to supplied argument types. Skip
THIS for static methods. */
bv = rank_function (parm_types, nparms,
arg_types + static_offset,
args + static_offset,
nargs - static_offset);
if (!*oload_champ_bv)
@ -3081,6 +3093,7 @@ classify_oload_match (struct badness_vector *oload_champ_bv,
int static_offset)
{
int ix;
enum oload_classification worst = STANDARD;
for (ix = 1; ix <= nargs - static_offset; ix++)
{
@ -3093,11 +3106,13 @@ classify_oload_match (struct badness_vector *oload_champ_bv,
NS_POINTER_CONVERSION_BADNESS or worse return NON_STANDARD. */
else if (compare_ranks (oload_champ_bv->rank[ix],
NS_POINTER_CONVERSION_BADNESS) <= 0)
return NON_STANDARD; /* Non-standard type conversions
worst = NON_STANDARD; /* Non-standard type conversions
needed. */
}
return STANDARD; /* Only standard conversions needed. */
/* If no INCOMPATIBLE classification was found, return the worst one
that was found (if any). */
return worst;
}
/* C++: return 1 is NAME is a legitimate name for the destructor of
@ -3231,7 +3246,7 @@ compare_parameters (struct type *t1, struct type *t2, int skip_artificial)
for (i = 0; i < TYPE_NFIELDS (t2); ++i)
{
if (compare_ranks (rank_one_type (TYPE_FIELD_TYPE (t1, start + i),
TYPE_FIELD_TYPE (t2, i)),
TYPE_FIELD_TYPE (t2, i), NULL),
EXACT_MATCH_BADNESS) != 0)
return 0;
}

2
gdb/value.h
View File

@ -599,7 +599,7 @@ extern struct fn_field *value_find_oload_method_list (struct value **,
enum oload_search_type { NON_METHOD, METHOD, BOTH };
extern int find_overload_match (struct type **arg_types, int nargs,
extern int find_overload_match (struct value **args, int nargs,
const char *name,
enum oload_search_type method, int lax,
struct value **objp, struct symbol *fsym,