From 5dafb3d176ab8d9b9f0a46111d7040bb51ad8f8e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 28 Mar 2018 15:21:08 -0600 Subject: [PATCH] Remove parameter from free_dwo_file The objfile parameter to free_dwo_file is unused, so remove it. gdb/ChangeLog 2018-03-30 Tom Tromey * dwarf2read.c (free_dwo_file): Remove "objfile" parameter. (free_dwo_file_cleanup, free_dwo_file_from_slot): Update. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2read.c | 12 ++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9b4675f281b..61f813115c4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-03-30 Tom Tromey + + * dwarf2read.c (free_dwo_file): Remove "objfile" parameter. + (free_dwo_file_cleanup, free_dwo_file_from_slot): Update. + 2018-03-30 Tom Tromey * dwarf2read.c (class free_cached_comp_units): New class. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 78404967380..1ab073804da 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -13513,13 +13513,11 @@ queue_and_load_all_dwo_tus (struct dwarf2_per_cu_data *per_cu) } /* Free all resources associated with DWO_FILE. - Close the DWO file and munmap the sections. - All memory should be on the objfile obstack. */ + Close the DWO file and munmap the sections. */ static void -free_dwo_file (struct dwo_file *dwo_file, struct objfile *objfile) +free_dwo_file (struct dwo_file *dwo_file) { - /* Note: dbfd is NULL for virtual DWO files. */ gdb_bfd_unref (dwo_file->dbfd); @@ -13533,9 +13531,8 @@ free_dwo_file_cleanup (void *arg) { struct free_dwo_file_cleanup_data *data = (struct free_dwo_file_cleanup_data *) arg; - struct objfile *objfile = data->dwarf2_per_objfile->objfile; - free_dwo_file (data->dwo_file, objfile); + free_dwo_file (data->dwo_file); xfree (data); } @@ -13546,9 +13543,8 @@ static int free_dwo_file_from_slot (void **slot, void *info) { struct dwo_file *dwo_file = (struct dwo_file *) *slot; - struct objfile *objfile = (struct objfile *) info; - free_dwo_file (dwo_file, objfile); + free_dwo_file (dwo_file); return 1; } -- 2.30.2