diff mbox series

[v2,4/8] Introduce symbol_block_ops::get_block_value

Message ID 20230314-submit-pragma-import-export-v2-4-dcff927191fb@adacore.com
State New
Headers
Series Implement Ada Pragma Import and Pragma Export |

Commit Message

Tom Tromey April 7, 2023, 4:39 p.m. UTC 
  This adds a new callback to symbol_block_ops.  This callback lets a
LOC_BLOCK symbol implement its own function to find the underlying
block.
---
 gdb/symtab.c | 3 ++-
 gdb/symtab.h | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/gdb/symtab.c b/gdb/symtab.c
index b7b77818fbe..d940abbd4ed 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -6404,7 +6404,8 @@  register_symbol_block_impl (enum address_class aclass,
 
   /* Sanity check OPS.  */
   gdb_assert (ops != NULL);
-  gdb_assert (ops->find_frame_base_location != NULL);
+  gdb_assert (ops->find_frame_base_location != nullptr
+	      || ops->get_block_value != nullptr);
 
   return result;
 }
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 8d3f5610bd3..d8e3c273f85 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1182,6 +1182,12 @@  struct symbol_block_ops
      the corresponding DW_AT_frame_base attribute.  */
   CORE_ADDR (*get_frame_base) (struct symbol *framefunc,
 			       frame_info_ptr frame);
+
+  /* Return the block for this function.  So far, this is used to
+     implement function aliases.  So, if this is set, then it's not
+     necessary to set the other functions in this structure; and vice
+     versa.  */
+  const block *(*get_block_value) (const struct symbol *sym);
 };
 
 /* Functions used with LOC_REGISTER and LOC_REGPARM_ADDR.  */
@@ -1536,6 +1542,9 @@  struct block_symbol
 inline const block *
 symbol::value_block () const
 {
+  if (SYMBOL_BLOCK_OPS (this) != nullptr
+      && SYMBOL_BLOCK_OPS (this)->get_block_value != nullptr)
+    return SYMBOL_BLOCK_OPS (this)->get_block_value (this);
   return m_value.block;
 }