Remove symbol_matches_domain. This fixes

[deliverable/binutils-gdb.git] / gdb / psymtab.c

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 2787f4cf8d3a4f1e630c1d7dbef6673b189e187e..8f2de2ae729909ecef2e1fad86cf33d36b4572fc 100644 (file)
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -594,8 +594,7 @@ match_partial_symbol (struct objfile *objfile,
       while (top <= real_top
             && match (SYMBOL_SEARCH_NAME (*top), name) == 0)
        {
-         if (symbol_matches_domain (SYMBOL_LANGUAGE (*top),
-                                    SYMBOL_DOMAIN (*top), domain))
+         if (SYMBOL_DOMAIN (*top) == domain)
            return *top;
          top++;
        }
@@ -608,8 +607,7 @@ match_partial_symbol (struct objfile *objfile,
     {
       for (psym = start; psym < start + length; psym++)
        {
-         if (symbol_matches_domain (SYMBOL_LANGUAGE (*psym),
-                                    SYMBOL_DOMAIN (*psym), domain)
+         if (SYMBOL_DOMAIN (*psym) == domain
              && match (SYMBOL_SEARCH_NAME (*psym), name) == 0)
            return *psym;
        }
@@ -725,8 +723,7 @@ lookup_partial_symbol (struct objfile *objfile,
 
       while (top <= real_top && SYMBOL_MATCHES_SEARCH_NAME (*top, search_name))
        {
-         if (symbol_matches_domain (SYMBOL_LANGUAGE (*top),
-                                    SYMBOL_DOMAIN (*top), domain))
+         if (SYMBOL_DOMAIN (*top) == domain)
            {
              do_cleanups (cleanup);
              return (*top);
@@ -742,8 +739,7 @@ lookup_partial_symbol (struct objfile *objfile,
     {
       for (psym = start; psym < start + length; psym++)
        {
-         if (symbol_matches_domain (SYMBOL_LANGUAGE (*psym),
-                                    SYMBOL_DOMAIN (*psym), domain)
+         if (SYMBOL_DOMAIN (*psym) == domain
              && SYMBOL_MATCHES_SEARCH_NAME (*psym, search_name))
            {
              do_cleanups (cleanup);
@@ -1223,8 +1219,7 @@ map_block (const char *name, domain_enum namespace, struct objfile *objfile,
   for (sym = block_iter_match_first (block, name, match, &iter);
        sym != NULL; sym = block_iter_match_next (name, match, &iter))
     {
-      if (symbol_matches_domain (SYMBOL_LANGUAGE (sym), 
-                                SYMBOL_DOMAIN (sym), namespace))
+      if (SYMBOL_DOMAIN (sym) == namespace)
        {
          if (callback (block, sym, data))
            return 1;