From 210bbc17ac115d12dbde59b5de97b8547e7465c8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 26 Nov 2012 15:54:29 +0000 Subject: [PATCH] * ada-lang.c (user_select_syms): Use SYMBOL_SYMTAB. * dwarf2read.c (dw2_find_symbol_file, fixup_go_packaging): Use SYMBOL_SYMTAB. * skip.c (skip_info): Use SYMBOL_SYMTAB. --- gdb/ChangeLog | 7 +++++++ gdb/ada-lang.c | 2 +- gdb/dwarf2read.c | 7 ++++--- gdb/skip.c | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b14fc8e002..41e7a30ed0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-11-26 Tom Tromey + + * ada-lang.c (user_select_syms): Use SYMBOL_SYMTAB. + * dwarf2read.c (dw2_find_symbol_file, fixup_go_packaging): Use + SYMBOL_SYMTAB. + * skip.c (skip_info): Use SYMBOL_SYMTAB. + 2012-11-26 Maxime Villard Pedro Alves diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index e1dced5ef3..0621c79b32 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -3583,7 +3583,7 @@ See set/show multiple-symbol.")); (SYMBOL_CLASS (syms[i].sym) == LOC_CONST && SYMBOL_TYPE (syms[i].sym) != NULL && TYPE_CODE (SYMBOL_TYPE (syms[i].sym)) == TYPE_CODE_ENUM); - struct symtab *symtab = syms[i].sym->symtab; + struct symtab *symtab = SYMBOL_SYMTAB (syms[i].sym); if (SYMBOL_LINE (syms[i].sym) != 0 && symtab != NULL) printf_unfiltered (_("[%d] %s at %s:%d\n"), diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 9ecdf4b0c6..f4bd7a9790 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -3402,7 +3402,7 @@ dw2_find_symbol_file (struct objfile *objfile, const char *name) struct symbol *sym = lookup_block_symbol (block, name, VAR_DOMAIN); if (sym) - return sym->symtab->filename; + return SYMBOL_SYMTAB (sym)->filename; } return NULL; } @@ -6754,8 +6754,9 @@ fixup_go_packaging (struct dwarf2_cu *cu) if (strcmp (package_name, this_package_name) != 0) complaint (&symfile_complaints, _("Symtab %s has objects from two different Go packages: %s and %s"), - (sym->symtab && sym->symtab->filename - ? sym->symtab->filename + (SYMBOL_SYMTAB (sym) + && SYMBOL_SYMTAB (sym)->filename + ? SYMBOL_SYMTAB (sym)->filename : cu->objfile->name), this_package_name, package_name); xfree (this_package_name); diff --git a/gdb/skip.c b/gdb/skip.c index 5a3fae388e..9041b857e9 100644 --- a/gdb/skip.c +++ b/gdb/skip.c @@ -304,7 +304,7 @@ Skiplist entry should have either a filename or a function name.")); if (sym) ui_out_field_fmt (current_uiout, "what", "%s at %s:%d", sym->ginfo.name, - sym->symtab->filename, + SYMBOL_SYMTAB (sym)->filename, sym->line); else ui_out_field_string (current_uiout, "what", "?");