diff mbox series

[20/29] Simplify some symbol searches in Ada code

Message ID	20231120-submit-domain-hacks-2-v1-20-29650d01b198@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 495353858C33 From: Tom Tromey <tom@tromey.com> Date: Mon, 20 Nov 2023 20:53:51 -0700 Subject: [PATCH 20/29] Simplify some symbol searches in Ada code MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231120-submit-domain-hacks-2-v1-20-29650d01b198@tromey.com> References: <20231120-submit-domain-hacks-2-v1-0-29650d01b198@tromey.com> In-Reply-To: <20231120-submit-domain-hacks-2-v1-0-29650d01b198@tromey.com> To: gdb-patches@sourceware.org Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org
Series	Restructure symbol domains \| [00/29] Restructure symbol domains [01/29] Fix bug in cooked index scanner [02/29] Small cleanup in DWARF reader [03/29] Make nsalias.exp more reliable [04/29] Fix latent bug in mdebugread.c [05/29] Give names to unspecified types [06/29] Remove NR_DOMAINS [07/29] Simplify symbol_to_info_string [08/29] Split up a big 'if' in symtab.c [09/29] Use a .def file for domain_enum [10/29] Add two new symbol domains [11/29] Add domain_search_flags [12/29] Replace search_domain with domain_search_flags [13/29] Remove a check of VAR_DOMAIN [14/29] Introduce "scripting" domains [15/29] Use domain_search_flags in lookup_global_symbol_language [16/29] Use domain_search_flags in lookup_symbol et al [17/29] Remove some obsolete Python constants [18/29] Remove old symbol_matches_domain [19/29] Use the new symbol domains [20/29] Simplify some symbol searches in Ada code [21/29] Simplify some symbol searches in linespec.c [22/29] Only search for "main" as a function [23/29] Only look for functions in expand_symtabs_for_function [24/29] Use a function-domain search in inside_main_func [25/29] Only search types in cp_lookup_rtti_type [26/29] Only search types in lookup_typename [27/29] Only search for functions in rust_structop::evaluate_funcall [28/29] Refine search in cp_search_static_and_baseclasses [29/29] Document new Python and Guile constants

Checks

Context	Check	Description
linaro-tcwg-bot/tcwg_gdb_build--master-arm	success	Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64	success	Testing passed

Commit Message

Tom Tromey Nov. 21, 2023, 3:53 a.m. UTC

  This changes some of the Ada code to simplify symbol searches.  For
example, if a function is being looked for, the search is narrowed to
use SEARCH_FUNCTION_DOMAIN rather than SEARCH_VFT.  In one spot, a
search of the "struct" domain is removed, because Ada does not have a
tag domain.
---
 gdb/ada-exp.y             |  4 ++--
 gdb/ada-lang.c            | 10 ++--------
 gdb/dwarf2/ada-imported.c |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff mbox series

Patch

diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index df7a85f101d..613e284c166 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -1404,7 +1404,7 @@  block_lookup (const struct block *context, const char *raw_name)
     }
 
   std::vector<struct block_symbol> syms
-    = ada_lookup_symbol_list (name, context, SEARCH_VFT);
+    = ada_lookup_symbol_list (name, context, SEARCH_FUNCTION_DOMAIN);
 
   if (context == NULL
       && (syms.empty () || syms[0].symbol->aclass () != LOC_BLOCK))
@@ -1483,7 +1483,7 @@  find_primitive_type (struct parser_state *par_state, const char *name)
 	(char *) alloca (strlen (name) + sizeof ("standard__"));
       strcpy (expanded_name, "standard__");
       strcat (expanded_name, name);
-      sym = ada_lookup_symbol (expanded_name, NULL, SEARCH_VFT).symbol;
+      sym = ada_lookup_symbol (expanded_name, NULL, SEARCH_TYPE_DOMAIN).symbol;
       if (sym != NULL && sym->aclass () == LOC_TYPEDEF)
 	type = sym->type ();
     }
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index ad5fac05468..6efc4819088 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -7496,14 +7496,8 @@  field_alignment (struct type *type, int f)
 static struct symbol *
 ada_find_any_type_symbol (const char *name)
 {
-  struct symbol *sym;
-
-  sym = standard_lookup (name, get_selected_block (NULL), SEARCH_VFT);
-  if (sym != NULL && sym->aclass () == LOC_TYPEDEF)
-    return sym;
-
-  sym = standard_lookup (name, NULL, SEARCH_STRUCT_DOMAIN);
-  return sym;
+  return standard_lookup (name, get_selected_block (nullptr),
+			  SEARCH_TYPE_DOMAIN);
 }
 
 /* Find a type named NAME.  Ignores ambiguity.  This routine will look
diff --git a/gdb/dwarf2/ada-imported.c b/gdb/dwarf2/ada-imported.c
index bfcfb779105..13d61a354c1 100644
--- a/gdb/dwarf2/ada-imported.c
+++ b/gdb/dwarf2/ada-imported.c
@@ -103,7 +103,7 @@  ada_alias_get_block_value (const struct symbol *sym)
 {
   const char *name = get_imported_name (sym);
   block_symbol real_symbol = lookup_global_symbol (name, nullptr,
-						   SEARCH_VFT);
+						   SEARCH_FUNCTION_DOMAIN);
   if (real_symbol.symbol == nullptr)
     error (_("could not find alias '%s' for function '%s'"),
 	   name, sym->print_name ());