From: Simon Marchi <simon.marchi@efficios.com>
Date: Sun, 21 Nov 2021 18:50:39 +0000 (-0500)
Subject: gdb: remove SYMBOL_MATCHES_SEARCH_NAME
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=81e32b6a84c54031d31de6ebcf74a91b29d1498a;p=binutils-gdb.git

gdb: remove SYMBOL_MATCHES_SEARCH_NAME

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
---

diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c
index 59dbaf16e62..f1a8f5ef9d4 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 b12c3af7f2b..30335ee55f8 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 88dab003c5c..a765d1a7618 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<char> 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);