diff mbox series

[06/28] Put all CTF symbols in global scope

Message ID	20250311-search-in-psyms-v1-6-d73d9be20983@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1CAE9385781B From: Tom Tromey <tom@tromey.com> Date: Tue, 11 Mar 2025 08:12:42 -0600 Subject: [PATCH 06/28] Put all CTF symbols in global scope MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250311-search-in-psyms-v1-6-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

Commit Message

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

  The new approach to searching (solely via the quick API) is more
sensitive to discrepancies between the partial and full readers.  In
CTF, there is some disagreement about which scope to use.  CTF doesn't
seem to really distinguish between the file and global scope, so this
patch takes the simple approach of putting all CTF symbols into the
global scope.

This changes one test as well.  It seems to me that the behavior here
is arbitrary and the test is making unwarranted assumptions.
---
 gdb/ctfread.c                             | 6 +++---
 gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/gdb/ctfread.c b/gdb/ctfread.c
index ee7c30f7d8737cc38aa7fae54d339438ae45377f..b9f8d7350538b52076f0fb91a18c8d6139701d32 100644
--- a/gdb/ctfread.c
+++ b/gdb/ctfread.c
@@ -516,7 +516,7 @@  new_symbol (struct ctf_context *ccp, struct type *type, ctf_id_t tid)
 	    break;
 	}
 
-      add_symbol_to_list (sym, ccp->builder->get_file_symbols ());
+      add_symbol_to_list (sym, ccp->builder->get_global_symbols ());
     }
 
   return sym;
@@ -1171,7 +1171,7 @@  ctf_add_var_cb (const char *name, ctf_id_t id, void *arg)
 	sym->set_domain (VAR_DOMAIN);
 	sym->set_aclass_index (LOC_OPTIMIZED_OUT);
 	sym->compute_and_set_names (name, false, ccp->of->per_bfd);
-	add_symbol_to_list (sym, ccp->builder->get_file_symbols ());
+	add_symbol_to_list (sym, ccp->builder->get_global_symbols ());
 	break;
       default:
 	complaint (_("ctf_add_var_cb: kind unsupported (%d)"), kind);
@@ -1510,7 +1510,7 @@  ctf_psymtab_type_cb (ctf_id_t tid, void *arg)
 
   ccp->pst->add_psymbol (name, false,
 			 domain, aclass, section,
-			 psymbol_placement::STATIC,
+			 psymbol_placement::GLOBAL,
 			 unrelocated_addr (0),
 			 language_c, ccp->partial_symtabs, ccp->of);
 
diff --git a/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp b/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp
index 7c6cb0d3bf14759f3fa40ab3926b0da8d7988dac..06242d3e74d4c8586826460d46266cb25406aa68 100644
--- a/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp
+++ b/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp
@@ -37,6 +37,6 @@  gdb_test_no_output "set always-read-ctf on"
 gdb_load $binfile
 
 # Same thing with struct and union.
-gdb_test "ptype struct A" "type = struct A \{\[\r\n\]+\[ \t\]+struct B \\*foo;\[\r\n\]+\}.*" "ptype structure A"
-gdb_test "ptype struct B" "type = struct B \{\[\r\n\]+\[ \t\]+struct B \\*next;\[\r\n\]+\}.*" "ptype structure B"
+gdb_test "ptype struct A" "type = struct A \{\[\r\n\]+\[ \t\]+long a;\[\r\n\]+\[ \t\]+struct B \\*foo;\[\r\n\]+\}.*" "ptype structure A"
+gdb_test "ptype struct B" "type = struct B \{\[\r\n\]+\[ \t\]+int foo;\[\r\n\]+\[ \t\]+struct A \\*bar;\[\r\n\]+\}.*" "ptype structure B"
 gdb_test "ptype struct C" "type = struct C \{\[\r\n\]+\[ \t\]+struct B \\*foo;\[\r\n\]+\[ \t\]+int b;\[\r\n\]+\}.*" "ptype structure C"