From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id YMDVMZnn82EjewAAWB0awg (envelope-from ) for ; Fri, 28 Jan 2022 07:54:49 -0500 Received: by simark.ca (Postfix, from userid 112) id CA0CD1F3B7; Fri, 28 Jan 2022 07:54:49 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 6878F1EE18 for ; Fri, 28 Jan 2022 07:54:49 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0DB8C3947C27 for ; Fri, 28 Jan 2022 12:54:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0DB8C3947C27 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1643374489; bh=nSFb2boiOniFM1DyNTm+lpaElBh84oDLCciQ0ppeU94=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=fQaVJ1xHyw21AXR8WXFZOk3cOXuSWAVk4H2fOuOtsBhluopwTS5UZqR/D0lolrI0J i/Z5/fLINDM+Zodb5cx6fwPLZ0hpp84z6RRPYTjzqaAdqA7R6o2ZOurjFxx2tD16mc zZvbWVhuLdmvxXQCMI30WNmNGUs0yPS65Sq3ae90= Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id F225D385E83E for ; Fri, 28 Jan 2022 12:49:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F225D385E83E X-ASG-Debug-ID: 1643374173-0c856e06ad271a90001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id NambMyC72ToP5KWT (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 28 Jan 2022 07:49:33 -0500 (EST) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.localdomain (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) by smtp.ebox.ca (Postfix) with ESMTP id 6420A441D69; Fri, 28 Jan 2022 07:49:33 -0500 (EST) X-Barracuda-RBL-IP: 192.222.157.6 X-Barracuda-Effective-Source-IP: 192-222-157-6.qc.cable.ebox.net[192.222.157.6] X-Barracuda-Apparent-Source-IP: 192.222.157.6 To: gdb-patches@sourceware.org Subject: [PATCH 23/33] gdb: remove SYMBOL_MATCHES_SEARCH_NAME Date: Fri, 28 Jan 2022 07:45:21 -0500 X-ASG-Orig-Subj: [PATCH 23/33] gdb: remove SYMBOL_MATCHES_SEARCH_NAME Message-Id: <20220128124531.2302941-24-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128124531.2302941-1-simon.marchi@polymtl.ca> References: <20220128124531.2302941-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1643374173 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Barracuda-BRTS-Status: 1 X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-Scan-Msg-Size: 2548 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.95629 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Cc: Simon Marchi Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" From: Simon Marchi It seems like this macro is not needed at all anymore, it just wraps the function of the same name with the same arguments. Change-Id: I3c342ac8d89c27af5aee1a819dc32cc6396fd41b --- gdb/symfile-debug.c | 4 ++-- gdb/symtab.c | 2 +- gdb/symtab.h | 7 +------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c index 59dbaf16e62b..f1a8f5ef9d4e 100644 --- a/gdb/symfile-debug.c +++ b/gdb/symfile-debug.c @@ -257,14 +257,14 @@ objfile::lookup_symbol (block_enum kind, const char *name, domain_enum domain) information (but NAME might contain it). */ if (sym != NULL - && SYMBOL_MATCHES_SEARCH_NAME (sym, lookup_name)) + && symbol_matches_search_name (sym, lookup_name)) { retval = stab; /* Found it. */ return false; } if (with_opaque != NULL - && SYMBOL_MATCHES_SEARCH_NAME (with_opaque, lookup_name)) + && symbol_matches_search_name (with_opaque, lookup_name)) retval = stab; /* Keep looking through other psymtabs. */ diff --git a/gdb/symtab.c b/gdb/symtab.c index b12c3af7f2ba..30335ee55f8c 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1264,7 +1264,7 @@ eq_symbol_entry (const struct symbol_cache_slot *slot, struct symbol *sym = slot->value.found.symbol; lookup_name_info lookup_name (name, symbol_name_match_type::FULL); - if (!SYMBOL_MATCHES_SEARCH_NAME (sym, lookup_name)) + if (!symbol_matches_search_name (sym, lookup_name)) return 0; if (!symbol_matches_domain (sym->language (), slot_domain, domain)) diff --git a/gdb/symtab.h b/gdb/symtab.h index 88dab003c5c3..a765d1a76180 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -595,13 +595,8 @@ extern CORE_ADDR get_symbol_address (const struct symbol *sym); extern gdb::unique_xmalloc_ptr symbol_find_demangled_name (struct general_symbol_info *gsymbol, const char *mangled); -/* Return true if NAME matches the "search" name of SYMBOL, according +/* Return true if NAME matches the "search" name of GSYMBOL, according to the symbol's language. */ -#define SYMBOL_MATCHES_SEARCH_NAME(symbol, name) \ - symbol_matches_search_name ((symbol), (name)) - -/* Helper for SYMBOL_MATCHES_SEARCH_NAME that works with both symbols - and psymbols. */ extern bool symbol_matches_search_name (const struct general_symbol_info *gsymbol, const lookup_name_info &name); -- 2.34.1