[v2,19/30] Remove old symbol_matches_domain

Message ID 20240118-submit-domain-hacks-2-v2-19-aecab29fa104@tromey.com
State New
Headers
Series Restructure symbol domains |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 fail Patch failed to apply
linaro-tcwg-bot/tcwg_gdb_build--master-arm fail Patch failed to apply

Commit Message

Tom Tromey Jan. 18, 2024, 8:32 p.m. UTC
  Nothing calls the variant of symbol_matches_domain that accepts a
domain_enum for searching, so this patch removes it and the
corresponding symbol::matches.
---
 gdb/symtab.c | 20 --------------------
 gdb/symtab.h | 11 -----------
 2 files changed, 31 deletions(-)
  

Patch

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 5735786ac44..b8588355921 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2676,26 +2676,6 @@  lookup_global_symbol (const char *name,
     return bs;
 }
 
-bool
-symbol_matches_domain (enum language symbol_language,
-		       domain_enum symbol_domain,
-		       domain_enum domain)
-{
-  /* For C++ "struct foo { ... }" also defines a typedef for "foo".
-     Similarly, any Ada type declaration implicitly defines a typedef.  */
-  if (symbol_language == language_cplus
-      || symbol_language == language_d
-      || symbol_language == language_ada
-      || symbol_language == language_rust)
-    {
-      if ((domain == VAR_DOMAIN || domain == STRUCT_DOMAIN)
-	  && symbol_domain == STRUCT_DOMAIN)
-	return true;
-    }
-  /* For all other languages, strict match is required.  */
-  return (symbol_domain == domain);
-}
-
 /* See symtab.h.  */
 
 bool
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 340ad170ece..8624006746d 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1242,10 +1242,6 @@  enum symbol_subclass_kind
 
 extern gdb::array_view<const struct symbol_impl> symbol_impls;
 
-bool symbol_matches_domain (enum language symbol_language,
-			    domain_enum symbol_domain,
-			    domain_enum domain);
-
 /* This structure is space critical.  See space comments at the top.  */
 
 struct symbol : public general_symbol_info, public allocate_on_obstack
@@ -1292,13 +1288,6 @@  struct symbol : public general_symbol_info, public allocate_on_obstack
     return this->impl ().aclass;
   }
 
-  /* Call symbol_matches_domain on this symbol, using the symbol's
-     domain.  */
-  bool matches (domain_enum d) const
-  {
-    return symbol_matches_domain (language (), domain (), d);
-  }
-
   /* Return true if this symbol's domain matches FLAGS.  */
   bool matches (domain_search_flags flags) const;