projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2012-03-01 Pedro Alves <palves@redhat.com>
[deliverable/binutils-gdb.git]
/
gdb
/
gdbtypes.c
diff --git
a/gdb/gdbtypes.c
b/gdb/gdbtypes.c
index b1dada519806af2ed9dff78a5ab5394bfbffb326..b6e8b4c2355aa568b79545e2b46bf80d3471d708 100644
(file)
--- a/
gdb/gdbtypes.c
+++ b/
gdb/gdbtypes.c
@@
-1,8
+1,6
@@
/* Support routines for manipulating internal types for GDB.
/* Support routines for manipulating internal types for GDB.
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Contributed by Cygnus Support, using pieces from other GDB modules.
Contributed by Cygnus Support, using pieces from other GDB modules.
@@
-35,11
+33,10
@@
#include "demangle.h"
#include "complaints.h"
#include "gdbcmd.h"
#include "demangle.h"
#include "complaints.h"
#include "gdbcmd.h"
-#include "wrapper.h"
#include "cp-abi.h"
#include "gdb_assert.h"
#include "hashtab.h"
#include "cp-abi.h"
#include "gdb_assert.h"
#include "hashtab.h"
-
+#include "exceptions.h"
/* Initialize BADNESS constants. */
/* Initialize BADNESS constants. */
@@
-60,7
+57,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 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. */
const struct rank NS_POINTER_CONVERSION_BADNESS = {10,0};
/* Floatformat pairs. */
@@
-1095,7
+1092,7
@@
smash_to_method_type (struct type *type, struct type *domain,
/* Return a typename for a struct/union/enum type without "struct ",
"union ", or "enum ". If the type has a NULL name, return NULL. */
/* Return a typename for a struct/union/enum type without "struct ",
"union ", or "enum ". If the type has a NULL name, return NULL. */
-char *
+c
onst c
har *
type_name_no_tag (const struct type *type)
{
if (TYPE_TAG_NAME (type) != NULL)
type_name_no_tag (const struct type *type)
{
if (TYPE_TAG_NAME (type) != NULL)
@@
-1167,7
+1164,7
@@
lookup_typename (const struct language_defn *language,
struct type *
lookup_unsigned_typename (const struct language_defn *language,
struct type *
lookup_unsigned_typename (const struct language_defn *language,
- struct gdbarch *gdbarch, char *name)
+ struct gdbarch *gdbarch, c
onst c
har *name)
{
char *uns = alloca (strlen (name) + 10);
{
char *uns = alloca (strlen (name) + 10);
@@
-1178,7
+1175,7
@@
lookup_unsigned_typename (const struct language_defn *language,
struct type *
lookup_signed_typename (const struct language_defn *language,
struct type *
lookup_signed_typename (const struct language_defn *language,
- struct gdbarch *gdbarch, char *name)
+ struct gdbarch *gdbarch, c
onst c
har *name)
{
struct type *t;
char *uns = alloca (strlen (name) + 8);
{
struct type *t;
char *uns = alloca (strlen (name) + 8);
@@
-1341,7
+1338,7
@@
lookup_struct_elt_type (struct type *type, char *name, int noerr)
for (i = TYPE_NFIELDS (type) - 1; i >= TYPE_N_BASECLASSES (type); i--)
{
for (i = TYPE_NFIELDS (type) - 1; i >= TYPE_N_BASECLASSES (type); i--)
{
- char *t_field_name = TYPE_FIELD_NAME (type, i);
+ c
onst c
har *t_field_name = TYPE_FIELD_NAME (type, i);
if (t_field_name && (strcmp_iw (t_field_name, name) == 0))
{
if (t_field_name && (strcmp_iw (t_field_name, name) == 0))
{
@@
-1454,6
+1451,10
@@
stub_noname_complaint (void)
not been computed and we're either in the middle of reading symbols, or
there was no name for the typedef in the debug info.
not been computed and we're either in the middle of reading symbols, or
there was no name for the typedef in the debug info.
+ NOTE: Lookup of opaque types can throw errors for invalid symbol files.
+ QUITs in the symbol reading code can also throw.
+ Thus this function can throw an exception.
+
If TYPE is a TYPE_CODE_TYPEDEF, its length is updated to the length of
the target type.
If TYPE is a TYPE_CODE_TYPEDEF, its length is updated to the length of
the target type.
@@
-1479,7
+1480,7
@@
check_typedef (struct type *type)
{
if (!TYPE_TARGET_TYPE (type))
{
{
if (!TYPE_TARGET_TYPE (type))
{
- char *name;
+ c
onst c
har *name;
struct symbol *sym;
/* It is dangerous to call lookup_symbol if we are currently
struct symbol *sym;
/* It is dangerous to call lookup_symbol if we are currently
@@
-1542,7
+1543,7
@@
check_typedef (struct type *type)
&& opaque_type_resolution
&& !currently_reading_symtab)
{
&& opaque_type_resolution
&& !currently_reading_symtab)
{
- char *name = type_name_no_tag (type);
+ c
onst c
har *name = type_name_no_tag (type);
struct type *newtype;
if (name == NULL)
struct type *newtype;
if (name == NULL)
@@
-1576,7
+1577,7
@@
check_typedef (struct type *type)
types. */
else if (TYPE_STUB (type) && !currently_reading_symtab)
{
types. */
else if (TYPE_STUB (type) && !currently_reading_symtab)
{
- char *name = type_name_no_tag (type);
+ c
onst c
har *name = type_name_no_tag (type);
/* FIXME: shouldn't we separately check the TYPE_NAME and the
TYPE_TAG_NAME, and look in STRUCT_DOMAIN and/or VAR_DOMAIN
as appropriate? (this code was written before TYPE_NAME and
/* FIXME: shouldn't we separately check the TYPE_NAME and the
TYPE_TAG_NAME, and look in STRUCT_DOMAIN and/or VAR_DOMAIN
as appropriate? (this code was written before TYPE_NAME and
@@
-1673,14
+1674,20
@@
static struct type *
safe_parse_type (struct gdbarch *gdbarch, char *p, int length)
{
struct ui_file *saved_gdb_stderr;
safe_parse_type (struct gdbarch *gdbarch, char *p, int length)
{
struct ui_file *saved_gdb_stderr;
- struct type *type;
+ struct type *type = NULL; /* Initialize to keep gcc happy. */
+ volatile struct gdb_exception except;
/* Suppress error messages. */
saved_gdb_stderr = gdb_stderr;
gdb_stderr = ui_file_new ();
/* Call parse_and_eval_type() without fear of longjmp()s. */
/* Suppress error messages. */
saved_gdb_stderr = gdb_stderr;
gdb_stderr = ui_file_new ();
/* Call parse_and_eval_type() without fear of longjmp()s. */
- if (!gdb_parse_and_eval_type (p, length, &type))
+ TRY_CATCH (except, RETURN_MASK_ERROR)
+ {
+ type = parse_and_eval_type (p, length);
+ }
+
+ if (except.reason < 0)
type = builtin_type (gdbarch)->builtin_void;
/* Stop suppressing error messages. */
type = builtin_type (gdbarch)->builtin_void;
/* Stop suppressing error messages. */
@@
-2283,7
+2290,7
@@
compare_badness (struct badness_vector *a, struct badness_vector *b)
struct badness_vector *
rank_function (struct type **parms, int nparms,
struct badness_vector *
rank_function (struct type **parms, int nparms,
- struct
typ
e **args, int nargs)
+ struct
valu
e **args, int nargs)
{
int i;
struct badness_vector *bv;
{
int i;
struct badness_vector *bv;
@@
-2306,7
+2313,8
@@
rank_function (struct type **parms, int nparms,
/* Now rank all the parameters of the candidate function. */
for (i = 1; i <= min_len; i++)
/* 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++)
/* If more arguments than parameters, add dummy entries. */
for (i = min_len + 1; i <= nargs; i++)
@@
-2405,6
+2413,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.
* 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
*
* Return 0 if they are identical types;
* Otherwise, return an integer which corresponds to how compatible
@@
-2412,7
+2421,7
@@
types_equal (struct type *a, struct type *b)
* Generally the "bad" conversions are all uniformly assigned a 100. */
struct rank
* 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};
{
struct rank rank = {0,0};
@@
-2428,10
+2437,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)
/* 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)
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. */
REFERENCE_CONVERSION_BADNESS));
if (overload_debug)
/* Debugging only. */
@@
-2468,8
+2477,16
@@
rank_one_type (struct type *parm, struct type *arg)
return EXACT_MATCH_BADNESS;
return INCOMPATIBLE_TYPE_BADNESS;
case TYPE_CODE_FUNC:
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:
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:
case TYPE_CODE_ENUM:
case TYPE_CODE_FLAGS:
case TYPE_CODE_CHAR:
@@
-2484,7
+2501,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),
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;
}
default:
return INCOMPATIBLE_TYPE_BADNESS;
}
@@
-2492,7
+2509,7
@@
rank_one_type (struct type *parm, struct type *arg)
switch (TYPE_CODE (arg))
{
case TYPE_CODE_PTR: /* funcptr -> func */
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;
}
default:
return INCOMPATIBLE_TYPE_BADNESS;
}
@@
-2748,7
+2765,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),
/* 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;
}
default:
return INCOMPATIBLE_TYPE_BADNESS;
}
@@
-2883,8
+2900,6
@@
print_cplus_stuff (struct type *type, int spaces)
TYPE_N_BASECLASSES (type));
printfi_filtered (spaces, "nfn_fields %d\n",
TYPE_NFN_FIELDS (type));
TYPE_N_BASECLASSES (type));
printfi_filtered (spaces, "nfn_fields %d\n",
TYPE_NFN_FIELDS (type));
- printfi_filtered (spaces, "nfn_fields_total %d\n",
- TYPE_NFN_FIELDS_TOTAL (type));
if (TYPE_N_BASECLASSES (type) > 0)
{
printfi_filtered (spaces, "virtual_field_bits (%d bits at *",
if (TYPE_N_BASECLASSES (type) > 0)
{
printfi_filtered (spaces, "virtual_field_bits (%d bits at *",
This page took
0.026642 seconds
and
4
git commands to generate.