diff mbox series

[24/29] Use a function-domain search in inside_main_func

Message ID	20231120-submit-domain-hacks-2-v1-24-29650d01b198@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C33E53858409 From: Tom Tromey <tom@tromey.com> Date: Mon, 20 Nov 2023 20:53:55 -0700 Subject: [PATCH 24/29] 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: <20231120-submit-domain-hacks-2-v1-24-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 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 ce558bf6149..e86299491e2 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -2566,13 +2566,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 ();