diff mbox series

[v2,22/30] Simplify some symbol searches in linespec.c

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

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

  This simplifies some symbol searches in linespec.c.  In particular,
two separate searches here can now be combined into one, due to the
new use of flags.

Arguably the STRUCT_DOMAIN searches should perhaps not even be done.
Only C really has these, and C doesn't have member functions.
However, it seems relatively harmless -- and clearly compatible -- to
leave this in.
---
 gdb/linespec.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff mbox series

Patch

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 4e43bf28a67..b5bbd8c433c 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -3446,14 +3446,9 @@  lookup_prefix_sym (struct linespec_state *state,
   for (const auto &elt : file_symtabs)
     {
       if (elt == nullptr)
-	{
-	  iterate_over_all_matching_symtabs (state, lookup_name,
-					     SEARCH_STRUCT_DOMAIN,
-					     NULL, false, collector);
-	  iterate_over_all_matching_symtabs (state, lookup_name,
-					     SEARCH_VFT,
-					     NULL, false, collector);
-	}
+	iterate_over_all_matching_symtabs (state, lookup_name,
+					   SEARCH_STRUCT_DOMAIN | SEARCH_VFT,
+					   NULL, false, collector);
       else
 	{
 	  /* Program spaces that are executing startup should have
@@ -3463,10 +3458,7 @@  lookup_prefix_sym (struct linespec_state *state,
 	  gdb_assert (!pspace->executing_startup);
 	  set_current_program_space (pspace);
 	  iterate_over_file_blocks (elt, lookup_name,
-				    SEARCH_STRUCT_DOMAIN,
-				    collector);
-	  iterate_over_file_blocks (elt, lookup_name,
-				    SEARCH_VFT,
+				    SEARCH_STRUCT_DOMAIN | SEARCH_VFT,
 				    collector);
 	}
     }