diff mbox series

[26/28] Convert lookup_symbol_in_objfile

Message ID	20250311-search-in-psyms-v1-26-d73d9be20983@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B25FB3858435 From: Tom Tromey <tom@tromey.com> Date: Tue, 11 Mar 2025 08:13:02 -0600 Subject: [PATCH 26/28] Convert lookup_symbol_in_objfile MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250311-search-in-psyms-v1-26-d73d9be20983@tromey.com> References: <20250311-search-in-psyms-v1-0-d73d9be20983@tromey.com> In-Reply-To: <20250311-search-in-psyms-v1-0-d73d9be20983@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Precedence: list Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org
Series	Search symbols via quick API \| [00/28] Search symbols via quick API [01/28] Add another minor hack to cooked_index_entry::full_name [02/28] Change ada_decode to preserve upper-case in some situations [03/28] Emit some type declarations in .gdb_index [04/28] Ada import functions not in index [05/28] Fix index's handling of DW_TAG_imported_declaration [06/28] Put all CTF symbols in global scope [07/28] Restore "ingestion" of .debug_str when writing .debug_names [08/28] Entries from anon-struct.exp not in cooked index [09/28] Remove dwarf2_per_cu_data::mark [10/28] Have expand_symtabs_matching work for already-expanded CUs [11/28] Rewrite the .gdb_index reader [12/28] Convert default_collect_symbol_completion_matches_break_on [13/28] Convert gdbpy_lookup_static_symbols [14/28] Convert ada_add_global_exceptions [15/28] Convert ada_language_defn::collect_symbol_completion_matches [16/28] Convert ada-lang.c:map_matching_symbols [17/28] Remove expand_symtabs_matching [18/28] Simplify basic_lookup_transparent_type [19/28] Remove objfile::expand_symtabs_for_function [20/28] Convert linespec.c:iterate_over_all_matching_symtabs [21/28] Simplify block_lookup_symbol_primary [22/28] Pass lookup_name_info to block_lookup_symbol_primary [23/28] Simplify block_lookup_symbol [24/28] Add best_symbol_tracker [25/28] Convert lookup_symbol_via_quick_fns [26/28] Convert lookup_symbol_in_objfile [27/28] Make dw_expand_symtabs_matching_file_matcher static [28/28] Remove enter_symbol_lookup

Checks

Context	Check	Description
linaro-tcwg-bot/tcwg_gdb_build--master-arm	success	Build passed
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64	success	Build passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm	fail	Test failed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64	fail	Test failed

Commit Message

Tom Tromey March 11, 2025, 2:13 p.m. UTC

  This converts lookup_symbol_in_objfile to the callback approach by
removing the call to lookup_symbol_in_objfile_symtabs.  (The latter is
not removed as there are still other callers.)

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16994
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16998
---
 gdb/symtab.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff mbox series

Patch

diff --git a/gdb/symtab.c b/gdb/symtab.c
index dee25051c85db6444687ead8524281bb482c03eb..c325432f7af0f1f6811916406e7c8b902c5852ee 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2595,24 +2595,12 @@  lookup_symbol_in_objfile (struct objfile *objfile, enum block_enum block_index,
 			      ? "GLOBAL_BLOCK" : "STATIC_BLOCK",
 			      name, domain_name (domain).c_str ());
 
-  result = lookup_symbol_in_objfile_symtabs (objfile, block_index,
-					     name, domain);
-  if (result.symbol != NULL)
-    {
-      symbol_lookup_debug_printf
-	("lookup_symbol_in_objfile (...) = %s (in symtabs)",
-	 host_address_to_string (result.symbol));
-      return result;
-    }
-
   result = lookup_symbol_via_quick_fns (objfile, block_index,
 					name, domain);
-  symbol_lookup_debug_printf ("lookup_symbol_in_objfile (...) = %s%s",
+  symbol_lookup_debug_printf ("lookup_symbol_in_objfile (...) = %s",
 			      result.symbol != NULL
 			      ? host_address_to_string (result.symbol)
-			      : "NULL",
-			      result.symbol != NULL ? " (via quick fns)"
-			      : "");
+			      : "NULL");
   return result;
 }