From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32367 invoked by alias); 26 Nov 2012 15:54:10 -0000 Received: (qmail 32353 invoked by uid 22791); 26 Nov 2012 15:54:07 -0000 X-SWARE-Spam-Status: No, hits=-5.9 required=5.0 tests=AWL,BAYES_00,KAM_STOCKGEN,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 26 Nov 2012 15:54:00 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAQFs03P013505 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 26 Nov 2012 10:54:00 -0500 Received: from barimba (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAQFrxAS027518 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 26 Nov 2012 10:53:59 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Subject: FYI: use SYMBOL_SYMTAB accessor Date: Mon, 26 Nov 2012 15:54:00 -0000 Message-ID: <87r4ngicmg.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-11/txt/msg00659.txt.bz2 While working on a different patch I noticed a few spots that were not using the SYMBOL_SYMTAB accessor macro. This patch fixes these places. I'm checking it in as obvious. Tested by rebuilding. Tom 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. Index: ada-lang.c =================================================================== RCS file: /cvs/src/src/gdb/ada-lang.c,v retrieving revision 1.380 diff -u -r1.380 ada-lang.c --- ada-lang.c 12 Nov 2012 17:14:54 -0000 1.380 +++ ada-lang.c 26 Nov 2012 15:51:01 -0000 @@ -3583,7 +3583,7 @@ (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"), Index: dwarf2read.c =================================================================== RCS file: /cvs/src/src/gdb/dwarf2read.c,v retrieving revision 1.713 diff -u -r1.713 dwarf2read.c --- dwarf2read.c 20 Nov 2012 22:51:04 -0000 1.713 +++ dwarf2read.c 26 Nov 2012 15:51:06 -0000 @@ -3402,7 +3402,7 @@ 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 @@ 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); Index: skip.c =================================================================== RCS file: /cvs/src/src/gdb/skip.c,v retrieving revision 1.8 diff -u -r1.8 skip.c --- skip.c 9 Aug 2012 06:48:21 -0000 1.8 +++ skip.c 26 Nov 2012 15:51:06 -0000 @@ -304,7 +304,7 @@ 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", "?");