diff mbox series

[v2,25/30] Use a function-domain search in inside_main_func

Message ID	20240118-submit-domain-hacks-2-v2-25-aecab29fa104@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5A5803858CD1 From: Tom Tromey <tom@tromey.com> Date: Thu, 18 Jan 2024 13:32:23 -0700 Subject: [PATCH v2 25/30] Use a function-domain search in inside_main_func MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240118-submit-domain-hacks-2-v2-25-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 changes inside_main_func to search only for functions.
---
 gdb/frame.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff mbox series

Patch

diff --git a/gdb/frame.c b/gdb/frame.c
index 03f3c50cb8d..7d586eef244 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -2560,13 +2560,9 @@  inside_main_func (frame_info_ptr this_frame)
 	 symbol with the name of the main function.  In this case we should
 	 search the full symbols to see if we can find a match.  */
       struct block_symbol bs = lookup_symbol (name, nullptr,
-					      SEARCH_VFT, nullptr);
+					      SEARCH_FUNCTION_DOMAIN, nullptr);
 
-      /* We might have found some unrelated symbol.  For example, the
-	 Rust compiler can emit both a subprogram and a namespace with
-	 the same name in the same scope; and due to how gdb's symbol
-	 tables currently work, we can't request the one we'd
-	 prefer.  */
+      /* This lookup should always yield a block-valued symbol.  */
       if (bs.symbol != nullptr && bs.symbol->aclass () == LOC_BLOCK)
 	{
 	  const struct block *block = bs.symbol->value_block ();