diff mbox series

[25/29] Only search types in cp_lookup_rtti_type

Message ID	20231120-submit-domain-hacks-2-v1-25-29650d01b198@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1CFEA3858C2F From: Tom Tromey <tom@tromey.com> Date: Mon, 20 Nov 2023 20:53:56 -0700 Subject: [PATCH 25/29] Only search types in cp_lookup_rtti_type MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231120-submit-domain-hacks-2-v1-25-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 cp_lookup_rtti_type to only search for types -- not
functions or variables.  Due to the symbol-matching hack, this could
just use SEARCH_TYPE_DOMAIN, but I think it's better to be clear; also
I hold on to some hope that perhaps the hack can someday be removed.
---
 gdb/cp-support.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 6b228362d18..33867d2a272 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -1498,9 +1498,9 @@  cp_lookup_rtti_type (const char *name, const struct block *block)
   struct symbol * rtti_sym;
   struct type * rtti_type;
 
-  /* Use VAR_DOMAIN here as NAME may be a typedef.  PR 18141, 18417.
-     Classes "live" in both STRUCT_DOMAIN and VAR_DOMAIN.  */
-  rtti_sym = lookup_symbol (name, block, SEARCH_VFT, NULL).symbol;
+  rtti_sym = lookup_symbol (name, block,
+			    SEARCH_TYPE_DOMAIN | SEARCH_STRUCT_DOMAIN,
+			    nullptr).symbol;
 
   if (rtti_sym == NULL)
     {