diff options
| -rw-r--r-- | gdb/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 2 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 12 | ||||
| -rw-r--r-- | gdb/gdbtypes.h | 3 | ||||
| -rw-r--r-- | gdb/jv-lang.c | 7 | ||||
| -rw-r--r-- | gdb/stabsread.c | 5 |
6 files changed, 26 insertions, 14 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4d0b201..ed12e87 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,16 @@ 2009-06-29 Ulrich Weigand <uweigand@de.ibm.com> + * gdbtypes.h (make_function_type): Remove OBJFILE parameter. + * gdbtypes.c (make_function_type): Remove OBJFILE parameter. + (lookup_function_type): Update call. + * stabsread.c (read_type): Likewise. + * dwarf2read.c (read_subroutine_type): Use lookup_function_type + instead of make_function_type. + * jv-lang.c (type_from_class): Likewise. Do not allocate types + on the fake "dynamics" obstack. + +2009-06-29 Ulrich Weigand <uweigand@de.ibm.com> + * gdbtypes.h (struct builtin_type): Remove builtin_core_addr, nodebug_text_symbol, nodebug_data_symbol, nodebug_unknown_symbol, and nodebug_tls_symbol members. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 4b52b6a..cd92843 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -5297,7 +5297,7 @@ read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu) struct attribute *attr; type = die_type (die, cu); - ftype = make_function_type (type, (struct type **) 0, cu->objfile); + ftype = lookup_function_type (type); /* All functions in C++, Pascal and Java have prototypes. */ attr = dwarf2_attr (die, DW_AT_prototyped, cu); diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 07e92cb..3d5ad3b 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -378,24 +378,24 @@ lookup_reference_type (struct type *type) /* Lookup a function type that returns type TYPE. TYPEPTR, if nonzero, points to a pointer to memory where the function type should be stored. If *TYPEPTR is zero, update it to point to the - function type we return. We allocate new memory from OBJFILE if needed; use - NULL for permanent types. */ + function type we return. We allocate new memory if needed. */ struct type * -make_function_type (struct type *type, struct type **typeptr, - struct objfile *objfile) +make_function_type (struct type *type, struct type **typeptr) { struct type *ntype; /* New type */ + struct objfile *objfile; if (typeptr == 0 || *typeptr == 0) /* We'll need to allocate one. */ { - ntype = alloc_type (objfile); + ntype = alloc_type (TYPE_OBJFILE (type)); if (typeptr) *typeptr = ntype; } else /* We have storage, but need to reset it. */ { ntype = *typeptr; + objfile = TYPE_OBJFILE (ntype); smash_type (ntype); TYPE_OBJFILE (ntype) = objfile; } @@ -415,7 +415,7 @@ make_function_type (struct type *type, struct type **typeptr, struct type * lookup_function_type (struct type *type) { - return make_function_type (type, (struct type **) 0, TYPE_OBJFILE (type)); + return make_function_type (type, (struct type **) 0); } /* Identify address space identifier by name -- diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 7ef8ca2..97f018e 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -1186,8 +1186,7 @@ extern struct type *make_pointer_type (struct type *, struct type **); extern struct type *lookup_pointer_type (struct type *); -extern struct type *make_function_type (struct type *, struct type **, - struct objfile *); +extern struct type *make_function_type (struct type *, struct type **); extern struct type *lookup_function_type (struct type *); diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c index 0003e0d..f53c656 100644 --- a/gdb/jv-lang.c +++ b/gdb/jv-lang.c @@ -302,7 +302,10 @@ type_from_class (struct value *clas) if (type != NULL) return type; - type = alloc_type (objfile); + /* Do not use the "fake" dynamics objfile to own dynamically generated + types, as it does not provide an architecture, and it would not help + manage the lifetime of these types anyway. */ + type = alloc_type (NULL); TYPE_CODE (type) = TYPE_CODE_STRUCT; INIT_CPLUS_SPECIFIC (type); @@ -560,7 +563,7 @@ java_link_class_type (struct type *type, struct value *clas) fn_fields[k].physname = ""; fn_fields[k].is_stub = 1; /* FIXME */ - fn_fields[k].type = make_function_type (java_void_type, NULL, objfile); + fn_fields[k].type = lookup_function_type (java_void_type); TYPE_CODE (fn_fields[k].type) = TYPE_CODE_METHOD; } diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 624a4c0..e62bb15 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -1682,8 +1682,7 @@ again: case 'f': /* Function returning another type */ type1 = read_type (pp, objfile); - type = make_function_type (type1, dbx_lookup_type (typenums, objfile), - objfile); + type = make_function_type (type1, dbx_lookup_type (typenums, objfile)); break; case 'g': /* Prototyped function. (Sun) */ @@ -1707,7 +1706,7 @@ again: struct type *return_type = read_type (pp, objfile); struct type *func_type = make_function_type (return_type, - dbx_lookup_type (typenums, objfile), objfile); + dbx_lookup_type (typenums, objfile)); struct type_list { struct type *type; struct type_list *next; |