192b62ce0b
This introduces a new specialization of gdb::ref_ptr that can be used to manage BFD reference counts. Then it changes most places in gdb to use this new class, rather than explicit reference-counting or cleanups. This patch removes make_cleanup_bfd_unref. If you look you will see a couple of spots using "release" where a use of gdb_bfd_ref_ptr would be cleaner. These will be fixed in the next patch. I think this patch fixes some latent bugs. For example, it seems to me that previously objfpy_add_separate_debug_file leaked a BFD. I'm not 100% certain that the macho_symfile_read_all_oso change is correct. The existing code here is hard for me to follow. One goal of this sort of automated reference counting, though, is to make it more difficult to make logic errors; so hopefully the code is clear now. 2017-01-10 Tom Tromey <tom@tromey.com> * windows-tdep.c (windows_xfer_shared_library): Update. * windows-nat.c (windows_make_so): Update. * utils.h (make_cleanup_bfd_unref): Remove. * utils.c (do_bfd_close_cleanup, make_cleanup_bfd_unref): Remove. * symfile.h (symfile_bfd_open) (find_separate_debug_file_in_section): Return gdb_bfd_ref_ptr. * symfile.c (read_symbols, symbol_file_add) (separate_debug_file_exists): Update. (symfile_bfd_open): Return gdb_bfd_ref_ptr. (generic_load, reread_symbols): Update. * symfile-mem.c (symbol_file_add_from_memory): Update. * spu-linux-nat.c (spu_bfd_open): Return gdb_bfd_ref_ptr. (spu_symbol_file_add_from_memory): Update. * solist.h (struct target_so_ops) <bfd_open>: Return gdb_bfd_ref_ptr. (solib_bfd_fopen, solib_bfd_open): Return gdb_bfd_ref_ptr. * solib.c (solib_bfd_fopen, solib_bfd_open): Return gdb_bfd_ref_ptr. (solib_map_sections, reload_shared_libraries_1): Update. * solib-svr4.c (enable_break): Update. * solib-spu.c (spu_bfd_fopen): Return gdb_bfd_ref_ptr. * solib-frv.c (enable_break2): Update. * solib-dsbt.c (enable_break): Update. * solib-darwin.c (gdb_bfd_mach_o_fat_extract): Return gdb_bfd_ref_ptr. (darwin_solib_get_all_image_info_addr_at_init): Update. (darwin_bfd_open): Return gdb_bfd_ref_ptr. * solib-aix.c (solib_aix_bfd_open): Return gdb_bfd_ref_ptr. * record-full.c (record_full_save): Update. * python/py-objfile.c (objfpy_add_separate_debug_file): Update. * procfs.c (insert_dbx_link_bpt_in_file): Update. * minidebug.c (find_separate_debug_file_in_section): Return gdb_bfd_ref_ptr. * machoread.c (macho_add_oso_symfile): Change abfd to gdb_bfd_ref_ptr. (macho_symfile_read_all_oso): Update. (macho_check_dsym): Return gdb_bfd_ref_ptr. (macho_symfile_read): Update. * jit.c (bfd_open_from_target_memory): Return gdb_bfd_ref_ptr. (jit_bfd_try_read_symtab): Update. * gdb_bfd.h (gdb_bfd_open, gdb_bfd_fopen, gdb_bfd_openr) (gdb_bfd_openw, gdb_bfd_openr_iovec) (gdb_bfd_openr_next_archived_file, gdb_bfd_fdopenr): Return gdb_bfd_ref_ptr. (gdb_bfd_ref_policy): New struct. (gdb_bfd_ref_ptr): New typedef. * gdb_bfd.c (gdb_bfd_open, gdb_bfd_fopen, gdb_bfd_openr) (gdb_bfd_openw, gdb_bfd_openr_iovec) (gdb_bfd_openr_next_archived_file, gdb_bfd_fdopenr): Return gdb_bfd_ref_ptr. * gcore.h (create_gcore_bfd): Return gdb_bfd_ref_ptr. * gcore.c (create_gcore_bfd): Return gdb_bfd_ref_ptr. (gcore_command): Update. * exec.c (exec_file_attach): Update. * elfread.c (elf_symfile_read): Update. * dwarf2read.c (dwarf2_get_dwz_file): Update. (try_open_dwop_file, open_dwo_file): Return gdb_bfd_ref_ptr. (open_and_init_dwo_file): Update. (open_dwp_file): Return gdb_bfd_ref_ptr. (open_and_init_dwp_file): Update. * corelow.c (core_open): Update. * compile/compile-object-load.c (compile_object_load): Update. * common/gdb_ref_ptr.h (ref_ptr::operator->): New operator. * coffread.c (coff_symfile_read): Update. * cli/cli-dump.c (bfd_openr_or_error, bfd_openw_or_error): Return gdb_bfd_ref_ptr. Rename. (dump_bfd_file, restore_command): Update. * build-id.h (build_id_to_debug_bfd): Return gdb_bfd_ref_ptr. * build-id.c (build_id_to_debug_bfd): Return gdb_bfd_ref_ptr. (find_separate_debug_file_by_buildid): Update.
163 lines
4.2 KiB
C
163 lines
4.2 KiB
C
/* build-id-related functions.
|
|
|
|
Copyright (C) 1991-2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "bfd.h"
|
|
#include "gdb_bfd.h"
|
|
#include "build-id.h"
|
|
#include "gdb_vecs.h"
|
|
#include "symfile.h"
|
|
#include "objfiles.h"
|
|
#include "filenames.h"
|
|
#include "gdbcore.h"
|
|
|
|
/* See build-id.h. */
|
|
|
|
const struct bfd_build_id *
|
|
build_id_bfd_get (bfd *abfd)
|
|
{
|
|
if (!bfd_check_format (abfd, bfd_object))
|
|
return NULL;
|
|
|
|
if (abfd->build_id != NULL)
|
|
return abfd->build_id;
|
|
|
|
/* No build-id */
|
|
return NULL;
|
|
}
|
|
|
|
/* See build-id.h. */
|
|
|
|
int
|
|
build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
|
|
{
|
|
const struct bfd_build_id *found;
|
|
int retval = 0;
|
|
|
|
found = build_id_bfd_get (abfd);
|
|
|
|
if (found == NULL)
|
|
warning (_("File \"%s\" has no build-id, file skipped"),
|
|
bfd_get_filename (abfd));
|
|
else if (found->size != check_len
|
|
|| memcmp (found->data, check, found->size) != 0)
|
|
warning (_("File \"%s\" has a different build-id, file skipped"),
|
|
bfd_get_filename (abfd));
|
|
else
|
|
retval = 1;
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* See build-id.h. */
|
|
|
|
gdb_bfd_ref_ptr
|
|
build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
|
|
{
|
|
char *link, *debugdir;
|
|
VEC (char_ptr) *debugdir_vec;
|
|
struct cleanup *back_to;
|
|
int ix;
|
|
gdb_bfd_ref_ptr abfd;
|
|
int alloc_len;
|
|
|
|
/* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
|
|
alloc_len = (strlen (debug_file_directory)
|
|
+ (sizeof "/.build-id/" - 1) + 1
|
|
+ 2 * build_id_len + (sizeof ".debug" - 1) + 1);
|
|
link = (char *) alloca (alloc_len);
|
|
|
|
/* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
|
|
cause "/.build-id/..." lookups. */
|
|
|
|
debugdir_vec = dirnames_to_char_ptr_vec (debug_file_directory);
|
|
back_to = make_cleanup_free_char_ptr_vec (debugdir_vec);
|
|
|
|
for (ix = 0; VEC_iterate (char_ptr, debugdir_vec, ix, debugdir); ++ix)
|
|
{
|
|
size_t debugdir_len = strlen (debugdir);
|
|
const gdb_byte *data = build_id;
|
|
size_t size = build_id_len;
|
|
char *s;
|
|
char *filename = NULL;
|
|
struct cleanup *inner;
|
|
|
|
memcpy (link, debugdir, debugdir_len);
|
|
s = &link[debugdir_len];
|
|
s += sprintf (s, "/.build-id/");
|
|
if (size > 0)
|
|
{
|
|
size--;
|
|
s += sprintf (s, "%02x", (unsigned) *data++);
|
|
}
|
|
if (size > 0)
|
|
*s++ = '/';
|
|
while (size-- > 0)
|
|
s += sprintf (s, "%02x", (unsigned) *data++);
|
|
strcpy (s, ".debug");
|
|
|
|
/* lrealpath() is expensive even for the usually non-existent files. */
|
|
if (access (link, F_OK) == 0)
|
|
filename = lrealpath (link);
|
|
|
|
if (filename == NULL)
|
|
continue;
|
|
|
|
/* We expect to be silent on the non-existing files. */
|
|
inner = make_cleanup (xfree, filename);
|
|
abfd = gdb_bfd_open (filename, gnutarget, -1);
|
|
do_cleanups (inner);
|
|
|
|
if (abfd == NULL)
|
|
continue;
|
|
|
|
if (build_id_verify (abfd.get(), build_id_len, build_id))
|
|
break;
|
|
|
|
abfd.release ();
|
|
}
|
|
|
|
do_cleanups (back_to);
|
|
return abfd;
|
|
}
|
|
|
|
/* See build-id.h. */
|
|
|
|
char *
|
|
find_separate_debug_file_by_buildid (struct objfile *objfile)
|
|
{
|
|
const struct bfd_build_id *build_id;
|
|
|
|
build_id = build_id_bfd_get (objfile->obfd);
|
|
if (build_id != NULL)
|
|
{
|
|
gdb_bfd_ref_ptr abfd (build_id_to_debug_bfd (build_id->size,
|
|
build_id->data));
|
|
/* Prevent looping on a stripped .debug file. */
|
|
if (abfd != NULL
|
|
&& filename_cmp (bfd_get_filename (abfd.get ()),
|
|
objfile_name (objfile)) == 0)
|
|
warning (_("\"%s\": separate debug info file has no debug info"),
|
|
bfd_get_filename (abfd.get ()));
|
|
else if (abfd != NULL)
|
|
return xstrdup (bfd_get_filename (abfd.get ()));
|
|
}
|
|
return NULL;
|
|
}
|