* gdbtypes.h (struct cplus_struct_type): Delete member

nfn_fields_total.  All uses removed.
This commit is contained in:
Doug Evans 2012-01-08 21:02:45 +00:00
parent de64cffdf8
commit 4d72c0bc3e
6 changed files with 5 additions and 20 deletions

View File

@ -1,3 +1,8 @@
2012-01-08 Doug Evans <dje@google.com>
* gdbtypes.h (struct cplus_struct_type): Delete member
nfn_fields_total. All uses removed.
2012-01-06 Doug Evans <dje@google.com>
* dwarf2read.c: Move FIXME from dwarf2_build_psymtabs_hard

View File

@ -7408,7 +7408,6 @@ dwarf2_attach_fn_fields_to_type (struct field_info *fip, struct type *type,
struct dwarf2_cu *cu)
{
struct fnfieldlist *flp;
int total_length = 0;
int i;
if (cu->language == language_ada)
@ -7430,12 +7429,9 @@ dwarf2_attach_fn_fields_to_type (struct field_info *fip, struct type *type,
TYPE_ALLOC (type, sizeof (struct fn_field) * flp->length);
for (k = flp->length; (k--, nfp); nfp = nfp->next)
fn_flp->fn_fields[k] = nfp->fnfield;
total_length += flp->length;
}
TYPE_NFN_FIELDS (type) = fip->nfnfields;
TYPE_NFN_FIELDS_TOTAL (type) = total_length;
}
/* Returns non-zero if NAME is the name of a vtable member in CU's

View File

@ -2895,8 +2895,6 @@ print_cplus_stuff (struct type *type, int spaces)
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 *",

View File

@ -693,11 +693,6 @@ struct cplus_struct_type
short nfn_fields;
/* Number of methods described for this type, not including the
methods that it derives from. */
short nfn_fields_total;
/* Number of template arguments. */
unsigned short n_template_arguments;
@ -1050,7 +1045,6 @@ extern void allocate_gnat_aux_type (struct type *);
#define TYPE_VPTR_FIELDNO(thistype) TYPE_MAIN_TYPE(thistype)->vptr_fieldno
#define TYPE_FN_FIELDS(thistype) TYPE_CPLUS_SPECIFIC(thistype)->fn_fields
#define TYPE_NFN_FIELDS(thistype) TYPE_CPLUS_SPECIFIC(thistype)->nfn_fields
#define TYPE_NFN_FIELDS_TOTAL(thistype) TYPE_CPLUS_SPECIFIC(thistype)->nfn_fields_total
#define TYPE_SPECIFIC_FIELD(thistype) \
TYPE_MAIN_TYPE(thistype)->type_specific_field
#define TYPE_TYPE_SPECIFIC(thistype) TYPE_MAIN_TYPE(thistype)->type_specific

View File

@ -501,7 +501,6 @@ java_link_class_type (struct gdbarch *gdbarch,
temp = clas;
nmethods = value_as_long (value_struct_elt (&temp, NULL, "method_count",
NULL, "structure"));
TYPE_NFN_FIELDS_TOTAL (type) = nmethods;
j = nmethods * sizeof (struct fn_field);
fn_fields = (struct fn_field *)
obstack_alloc (&objfile->objfile_obstack, j);

View File

@ -2278,10 +2278,6 @@ read_member_functions (struct field_info *fip, char **pp, struct type *type,
{
int nfn_fields = 0;
int length = 0;
/* Total number of member functions defined in this class. If the class
defines two `f' functions, and one `g' function, then this will have
the value 3. */
int total_length = 0;
int i;
struct next_fnfield
{
@ -2681,7 +2677,6 @@ read_member_functions (struct field_info *fip, char **pp, struct type *type,
destr_fnlist->next = fip->fnlist;
fip->fnlist = destr_fnlist;
nfn_fields++;
total_length += has_destructor;
length -= has_destructor;
}
else if (is_v3)
@ -2732,7 +2727,6 @@ read_member_functions (struct field_info *fip, char **pp, struct type *type,
new_fnlist->next = fip->fnlist;
fip->fnlist = new_fnlist;
nfn_fields++;
total_length += length;
}
}
@ -2744,7 +2738,6 @@ read_member_functions (struct field_info *fip, char **pp, struct type *type,
memset (TYPE_FN_FIELDLISTS (type), 0,
sizeof (struct fn_fieldlist) * nfn_fields);
TYPE_NFN_FIELDS (type) = nfn_fields;
TYPE_NFN_FIELDS_TOTAL (type) = total_length;
}
return 1;