gdb: Update linkage name lookup function to allow mst_file_data/bss types.

From the commit 667ed4b14ddaa9af196481f1757c0e517e80b6ed onward, instead
of normal name GDB looks for the "jit_descriptor" linkage name in the JIT
code initialization.  Without this change, the function
"lookup_minimal_symbol_linkage", only matches the non-static data.  So in
case jit_debugger is static type then setting up breakpoint in the JIT code
fails.  Issue is seen for the intel compilers, where jit_debug_descriptor has
static type i.e. "mst_file_data".  Hence lookup_minimal_symbol_linkage returns
nullptr for it.  So, in this case breakpoint does not hit in the JIT code.
To resolve this, the commit introduces a new boolean argument to the
lookup_minimal_symbol_linkage function.  This argument allows the function to
also match mst_file_data and mst_file_bss types when set to true.  The
function is called with this new argument set to true only from JIT code
initialization handling, ensuring that the current behavior remains unchanged
for other cases.  Because handling of static types of data symbols for all cases
result in regression for "gdb.base/print-file-var.exp" test.

Example of minsym for the JIT code emitted by the intel compilers where
lookup_minimal_symbol_linkage fails without this change because jit_debugger
type is "mst_file_data".

(top-gdb) p *msymbol
$1 = {<general_symbol_info> =
{m_name = 0x7fffcc77dc95 "__jit_debug_descriptor",
m_value = {ivalue = 84325936, block = 0x506b630,
bytes = 0x506b630 <error: Cannot access memory at address 0x506b630>,
address = 0x506b630, unrel_addr = (unknown: 0x506b630),
common_block = 0x506b630, chain = 0x506b630},
language_specific = {obstack = 0x0, demangled_name = 0x0},
m_language = language_unknown, ada_mangled = 0, m_section = 29},
m_size = 24, filename = 0x55555a751b70 "JITLoaderGDB.cpp",
m_type = mst_file_data, created_by_gdb = 0,
m_target_flag_1 = 0, m_target_flag_2 = 0, m_has_size = 1,
name_set = 1, hash_next = 0x55555b86e4f0, demangled_hash_next = 0x0}

Updated the test "jit-elf-so.exp" to test the static type of jit_descriptor
object.

Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 1c9706dcd2a0b89654688636e340c8420d80f29a..2f421a4c266941d566e64fe622e681dae5d9e054 100644 (file)
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -19338,7 +19338,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
                         apply.  */
                      bound_minimal_symbol found
                        = (lookup_minimal_symbol_linkage
-                          (sym->linkage_name (), objfile));
+                          (sym->linkage_name (), objfile, false));
                      if (found.minsym != nullptr)
                        sym->maybe_copied = 1;
                    }

diff --git a/gdb/jit.c b/gdb/jit.c
index ed3b26cd4bd154550bd36ed2cf3fc7a4df093c8f..48be1c880c914f0ab960477fa07d8b572ae74ff6 100644 (file)
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -892,7 +892,8 @@ jit_breakpoint_re_set_internal (struct gdbarch *gdbarch, program_space *pspace)
        }
 
       bound_minimal_symbol desc_symbol
-       = lookup_minimal_symbol_linkage (jit_descriptor_name, the_objfile);
+       = lookup_minimal_symbol_linkage (jit_descriptor_name,
+                                        the_objfile, true);
       if (desc_symbol.minsym == NULL
          || desc_symbol.value_address () == 0)
        {

diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 33eb9072e5f3c49229ab7f70385538763f98d8b2..4e1868c9f87ffed15df9eb5a7b632ae01f9fdbaa 100644 (file)
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -561,7 +561,8 @@ iterate_over_minimal_symbols
 /* See minsyms.h.  */
 
 bound_minimal_symbol
-lookup_minimal_symbol_linkage (const char *name, struct objfile *objf)
+lookup_minimal_symbol_linkage (const char *name, struct objfile *objf,
+                              bool match_static_type)
 {
   unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
 
@@ -573,7 +574,10 @@ lookup_minimal_symbol_linkage (const char *name, struct objfile *objf)
        {
          if (strcmp (msymbol->linkage_name (), name) == 0
              && (msymbol->type () == mst_data
-                 || msymbol->type () == mst_bss))
+                 || msymbol->type () == mst_bss
+                 || (match_static_type
+                     && (msymbol->type () == mst_file_data
+                         || msymbol->type () == mst_file_bss))))
            return {msymbol, objfile};
        }
     }
@@ -596,7 +600,8 @@ lookup_minimal_symbol_linkage (program_space *pspace, const char *name,
        continue;
 
       bound_minimal_symbol minsym = lookup_minimal_symbol_linkage (name,
-                                                                  objfile);
+                                                                  objfile,
+                                                                  false);
       if (minsym.minsym != nullptr)
        return minsym;
     }

diff --git a/gdb/minsyms.h b/gdb/minsyms.h
index 9659f30dff8bb0a10c0ebe2c221626a4d8af2c6e..4e6d5db91395ce4f18a9158e20472dede86228c3 100644 (file)
--- a/gdb/minsyms.h
+++ b/gdb/minsyms.h
@@ -227,11 +227,12 @@ bound_minimal_symbol lookup_minimal_symbol_text (program_space *pspace,
    objfiles) for a global (not file-local) minsym whose linkage name
    is NAME.  This is somewhat similar to lookup_minimal_symbol_text,
    only data symbols (not text symbols) are considered, and a non-NULL
-   objfile is not accepted.  Returns a bound minimal symbol that
-   matches, or an "empty" bound minimal symbol otherwise.  */
+   objfile is not accepted.  The boolean argument allows matching the
+   static types of data symbols also.  Returns a bound minimal symbol
+   that matches, or an "empty" bound minimal symbol otherwise.  */
 
-extern bound_minimal_symbol lookup_minimal_symbol_linkage (const char *name,
-                                                          struct objfile *objf)
+extern bound_minimal_symbol lookup_minimal_symbol_linkage
+  (const char *name, struct objfile *objf, bool match_static_type)
   ATTRIBUTE_NONNULL (1) ATTRIBUTE_NONNULL (2);
 
 /* A variant of lookup_minimal_symbol_linkage that iterates over all

diff --git a/gdb/testsuite/gdb.base/jit-elf-so.exp b/gdb/testsuite/gdb.base/jit-elf-so.exp
index f28c181fa85e0e9c38d58b4c5d3a44e4babe8348..2759c64158849a158565f2e902f6b242c0e4bb83 100644 (file)
--- a/gdb/testsuite/gdb.base/jit-elf-so.exp
+++ b/gdb/testsuite/gdb.base/jit-elf-so.exp
@@ -46,7 +46,8 @@ set jit_solib_srcfile ${srcdir}/${subdir}/${jit_solib_basename}.c
 # On failure, return -1.
 proc compile_jit_dlmain {options} {
     global main_loader_srcfile main_loader_binfile main_loader_basename
-    set options [concat $options debug]
+    set options [concat $options debug \
+       additional_flags=-DJIT_DESCRIPTOR_LINKAGE="static"]
 
     if { [gdb_compile ${main_loader_srcfile} ${main_loader_binfile} \
            executable $options] != "" } {
@@ -133,7 +134,8 @@ proc one_jit_test {solib_binfiles_target match_str} {
 
 # Compile the main code (which loads the JIT objects) as a shared library.
 if { [compile_jit_elf_main_as_so $main_solib_srcfile $main_solib_binfile \
-       {additional_flags="-DMAIN=jit_dl_main"}] < 0 } {
+       {additional_flags="-DMAIN=jit_dl_main" \
+           additional_flags="-DJIT_DESCRIPTOR_LINKAGE=static"}] < 0 } {
     return
 }
 

diff --git a/gdb/testsuite/gdb.base/jit-protocol.h b/gdb/testsuite/gdb.base/jit-protocol.h
index d143dd6042c2d17ce93137b7baf995f3a3b7d02d..3e85c199c9f0a004a9fe1f5644d0b291d9da1386 100644 (file)
--- a/gdb/testsuite/gdb.base/jit-protocol.h
+++ b/gdb/testsuite/gdb.base/jit-protocol.h
@@ -26,6 +26,10 @@
 
 #include <stdint.h>
 
+#ifndef JIT_DESCRIPTOR_LINKAGE
+#define JIT_DESCRIPTOR_LINKAGE
+#endif
+
 typedef enum
 {
   JIT_NOACTION = 0,
@@ -51,7 +55,8 @@ struct jit_descriptor
   struct jit_code_entry *first_entry;
 };
 
-struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
+JIT_DESCRIPTOR_LINKAGE struct jit_descriptor __jit_debug_descriptor
+  = { 1, 0, 0, 0 };
 
 void __attribute__((noinline)) __jit_debug_register_code()
 {