From patchwork Thu Dec 19 01:42:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Terekhov, Mikhail via Gdb-patches" X-Patchwork-Id: 36956 Received: (qmail 89576 invoked by alias); 19 Dec 2019 01:42:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 89566 invoked by uid 89); 19 Dec 2019 01:42:44 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=natural_name X-HELO: mail-qk1-f201.google.com Received: from mail-qk1-f201.google.com (HELO mail-qk1-f201.google.com) (209.85.222.201) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 19 Dec 2019 01:42:42 +0000 Received: by mail-qk1-f201.google.com with SMTP id g28so2689337qkl.6 for ; Wed, 18 Dec 2019 17:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=7JubMlEoUyzJOjrEQJtAh0O3s/rOHn0Zs3PsBxslEEE=; b=RNAeTzMLhGsHk1pfXtClaVX1oaElLZIoi/2mDNsQP/xLzcvtk+OFUqhdUVURXFTKnm M/i1tT42Isnub5xkTMvP3Jb3kvJb1JNOt5cRo8w+TUAs+xVuvP/CL+2hnkGQt3UPF5eM XbkMUQzzdyi9iUq6QRF/aRJqBgIf0RiviclDy8tQv+rJoi0JbQwXukbL/jAKCUE6mcVY fRqaAAr5RPlrtU4pPjE5Y76J/j77/YSMAzC30fntve8uYygdSSDR+EtcG3V8r4rcmth1 M9YHS2WthJRoU80BrvutNsJyMSujm8oq62tOiTrzWxWYsFFrQRUHupzwbC27hsc6KD+S bAeA== Date: Wed, 18 Dec 2019 19:42:38 -0600 Message-Id: <20191219014238.85498-1-cbiesinger@google.com> Mime-Version: 1.0 Subject: [PATCH] Remove completion_list_add_msymbol X-Patchwork-Original-From: "Christian Biesinger via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Christian Biesinger To: gdb-patches@sourceware.org Cc: Christian Biesinger X-IsSubscribed: yes Now that both symbol and minimal_symbol inherit from general_symbol_info, we can use the same function for both here. gdb/ChangeLog: 2019-12-18 Christian Biesinger * symtab.c (completion_list_add_symbol): Update. (completion_list_add_msymbol): Remove. (default_collect_symbol_completion_matches_break_on): Update. Change-Id: Ifa01837d5f7e3438e7e6599c08baf1a2e7f086c9 --- gdb/symtab.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 26551372cb..a76c5d304f 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -5250,11 +5250,11 @@ completion_list_add_name (completion_tracker &tracker, } } -/* completion_list_add_name wrapper for struct symbol. */ +/* completion_list_add_name wrapper for struct general_symbol_info. */ static void completion_list_add_symbol (completion_tracker &tracker, - symbol *sym, + general_symbol_info *sym, const lookup_name_info &lookup_name, const char *text, const char *word) { @@ -5263,20 +5263,6 @@ completion_list_add_symbol (completion_tracker &tracker, lookup_name, text, word); } -/* completion_list_add_name wrapper for struct minimal_symbol. */ - -static void -completion_list_add_msymbol (completion_tracker &tracker, - minimal_symbol *sym, - const lookup_name_info &lookup_name, - const char *text, const char *word) -{ - completion_list_add_name (tracker, sym->language (), - sym->natural_name (), - lookup_name, text, word); -} - - /* ObjC: In case we are completing on a selector, look as the msymbol again and feed all the selectors into the mill. */ @@ -5614,8 +5600,8 @@ default_collect_symbol_completion_matches_break_on if (completion_skip_symbol (mode, msymbol)) continue; - completion_list_add_msymbol (tracker, msymbol, lookup_name, - sym_text, word); + completion_list_add_symbol (tracker, msymbol, lookup_name, + sym_text, word); completion_list_objc_symbol (tracker, msymbol, lookup_name, sym_text, word);