From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14447 invoked by alias); 19 Sep 2008 21:07:06 -0000 Received: (qmail 14307 invoked by uid 22791); 19 Sep 2008 21:07:06 -0000 X-Spam-Check-By: sourceware.org Received: from mx2.redhat.com (HELO mx2.redhat.com) (66.187.237.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 19 Sep 2008 21:06:31 +0000 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id m8JL5s0V001081 for ; Fri, 19 Sep 2008 17:06:14 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m8JL5gEv031277; Fri, 19 Sep 2008 17:05:42 -0400 Received: from opsy.redhat.com (vpn-10-76.bos.redhat.com [10.16.10.76]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id m8JL5fWF025480; Fri, 19 Sep 2008 17:05:41 -0400 Received: by opsy.redhat.com (Postfix, from userid 500) id CD69450800F; Fri, 19 Sep 2008 15:05:17 -0600 (MDT) To: gdb-patches@sourceware.org Subject: RFA: remove METHODS_DOMAIN From: Tom Tromey Reply-To: Tom Tromey X-Attribution: Tom Date: Fri, 19 Sep 2008 21:07:00 -0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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: 2008-09/txt/msg00422.txt.bz2 While reading code I noticed that METHODS_DOMAIN is not really used. It is checked for by search_symbols, but never passed in. This patch removes this constant. Built & regtested on x86-64 (compile farm). Please review. Tom :ADDPATCH symbols: 2008-09-18 Tom Tromey * symtab.c (search_symbols): Update. * symtab.h (domain_enum_tag) : Remove. diff --git a/gdb/symtab.c b/gdb/symtab.c index 1a0dcba..df5cd0b 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2987,7 +2987,6 @@ sort_search_symbols (struct symbol_search *prevtail, int nfound) Only symbols of KIND are searched: FUNCTIONS_DOMAIN - search all functions TYPES_DOMAIN - search all type names - METHODS_DOMAIN - search all methods NOT IMPLEMENTED VARIABLES_DOMAIN - search all symbols, excluding functions, type names, and constants (enums) @@ -3128,8 +3127,7 @@ search_symbols (char *regexp, domain_enum kind, int nfiles, char *files[], && ((kind == VARIABLES_DOMAIN && SYMBOL_CLASS (*psym) != LOC_TYPEDEF && SYMBOL_CLASS (*psym) != LOC_BLOCK) || (kind == FUNCTIONS_DOMAIN && SYMBOL_CLASS (*psym) == LOC_BLOCK) - || (kind == TYPES_DOMAIN && SYMBOL_CLASS (*psym) == LOC_TYPEDEF) - || (kind == METHODS_DOMAIN && SYMBOL_CLASS (*psym) == LOC_BLOCK)))) + || (kind == TYPES_DOMAIN && SYMBOL_CLASS (*psym) == LOC_TYPEDEF)))) { PSYMTAB_TO_SYMTAB (ps); keep_going = 0; @@ -3204,8 +3202,7 @@ search_symbols (char *regexp, domain_enum kind, int nfiles, char *files[], && SYMBOL_CLASS (sym) != LOC_BLOCK && SYMBOL_CLASS (sym) != LOC_CONST) || (kind == FUNCTIONS_DOMAIN && SYMBOL_CLASS (sym) == LOC_BLOCK) - || (kind == TYPES_DOMAIN && SYMBOL_CLASS (sym) == LOC_TYPEDEF) - || (kind == METHODS_DOMAIN && SYMBOL_CLASS (sym) == LOC_BLOCK)))) + || (kind == TYPES_DOMAIN && SYMBOL_CLASS (sym) == LOC_TYPEDEF)))) { /* match */ psr = (struct symbol_search *) xmalloc (sizeof (struct symbol_search)); diff --git a/gdb/symtab.h b/gdb/symtab.h index c124242..c312f4d 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -396,18 +396,15 @@ typedef enum domain_enum_tag /* Searching domains. These overlap with VAR_DOMAIN, providing some granularity with the search_symbols function. */ - /* Everything in VAR_DOMAIN minus FUNCTIONS_-, TYPES_-, and - METHODS_DOMAIN */ + /* Everything in VAR_DOMAIN minus FUNCTIONS_DOMAIN and + TYPES_DOMAIN. */ VARIABLES_DOMAIN, /* All functions -- for some reason not methods, though. */ FUNCTIONS_DOMAIN, /* All defined types */ - TYPES_DOMAIN, - - /* All class methods -- why is this separated out? */ - METHODS_DOMAIN + TYPES_DOMAIN } domain_enum;