[patch] [3/5] Types reference counting [make_function_type-objfile]

Jan Kratochvil
2009-04-11T10:22:03Z

Hi,

make_function_type was sometimes being called with permanent target type which
would now also create a permanent function type while it should be
objfile-associated function type instead.

This patch only fixes a small leak.

Thanks,
Jan

gdb/
2009-04-11 Jan Kratochvil <jan.kratochvil@redhat.com>

Make specifiable the make_function_type type memory ownership.
* gdbtypes.c (make_function_type): New parameter `objfile', use it
explicitely instead of TYPE-initialized removed local variable
`objfile'. Describe `objfile' it in the function comment.
(lookup_function_type): Update make_function_type callers.
* gdbtypes.h (make_function_type): Update the prototype.
* jv-lang.c (java_link_class_type): Update make_function_type callers.
* dwarf2read.c (read_subroutine_type): Likewise.
* stabsread.c (read_type): Likewise.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index c3f3838..bcf7bb8 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -5011,7 +5011,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);
+ ftype = make_function_type (type, (struct type **) 0, cu->objfile);

/* 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 fb52e1a..f415773 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 if needed. */
+ function type we return. We allocate new memory from OBJFILE if needed; use
+ NULL for permanent types. */

struct type *
-make_function_type (struct type *type, struct type **typeptr)
+make_function_type (struct type *type, struct type **typeptr,
+ struct objfile *objfile)
{
struct type *ntype; /* New type */
- struct objfile *objfile;

if (typeptr == 0 || *typeptr == 0) /* We'll need to allocate one. */
{
- ntype = alloc_type (TYPE_OBJFILE (type));
+ ntype = alloc_type (objfile);
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);
+ return make_function_type (type, (struct type **) 0, TYPE_OBJFILE (type));
}

/* Identify address space identifier by name --
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 3c4e948..fc54acc 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1165,7 +1165,8 @@ 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 **);
+extern struct type *make_function_type (struct type *, struct type **,
+ struct objfile *);

extern struct type *lookup_function_type (struct type *);

diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c
index 0d0f4bc..ce17a28 100644
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -557,7 +557,8 @@ java_link_class_type (struct type *type, struct value *clas)
}
fn_fields[k].physname = "";
fn_fields[k].is_stub = 1;
- fn_fields[k].type = make_function_type (java_void_type, NULL); /* FIXME */
+ /* FIXME */
+ fn_fields[k].type = make_function_type (java_void_type, NULL, objfile);
TYPE_CODE (fn_fields[k].type) = TYPE_CODE_METHOD;
}

diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index 5ce53e3..20bc4f5 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -1685,7 +1685,7 @@ again:

case 'f': /* Function returning another type */
type1 = read_type (pp, objfile);
- type = make_function_type (type1, dbx_lookup_type (typenums));
+ type = make_function_type (type1, dbx_lookup_type (typenums), objfile);
break;

case 'g': /* Prototyped function. (Sun) */
@@ -1708,7 +1708,8 @@ again:
const char *type_start = (*pp) - 1;
struct type *return_type = read_type (pp, objfile);
struct type *func_type
- = make_function_type (return_type, dbx_lookup_type (typenums));
+ = make_function_type (return_type, dbx_lookup_type (typenums),
+ objfile);
struct type_list {
struct type *type;
struct type_list *next;