@@ -5309,7 +5309,7 @@ remove_irrelevant_renamings (std::vector<struct block_symbol> *syms,
if (current_block == NULL)
return;
- current_function = block_linkage_function (current_block);
+ current_function = current_block->linkage_function ();
if (current_function == NULL)
return;
@@ -1887,7 +1887,7 @@ op_this_operation::do_generate_ax (struct expression *exp,
const struct language_defn *lang;
b = block_for_pc (ax->scope);
- func = block_linkage_function (b);
+ func = b->linkage_function ();
lang = language_def (func->language ());
sym = lookup_language_this (lang, b).symbol;
@@ -86,15 +86,13 @@ contained_in (const struct block *a, const struct block *b,
return false;
}
-
-/* Return the symbol for the function which contains a specified
- lexical block, described by a struct block BL. The return value
- will not be an inlined function; the containing function will be
- returned instead. */
+/* See block.h. */
struct symbol *
-block_linkage_function (const struct block *bl)
+block::linkage_function () const
{
+ const block *bl = this;
+
while ((bl->function () == NULL || bl->inlined_p ())
&& bl->superblock () != NULL)
bl = bl->superblock ();
@@ -231,6 +231,13 @@ struct block
void set_using (struct using_direct *using_decl, struct obstack *obstack);
+ /* Return the symbol for the function which contains a specified
+ lexical block, described by a struct block. The return value
+ will not be an inlined function; the containing function will be
+ returned instead. */
+
+ struct symbol *linkage_function () const;
+
/* Addresses in the executable code that are in this block. */
CORE_ADDR m_start;
@@ -364,8 +371,6 @@ struct blockvector
struct block *m_blocks[1];
};
-extern struct symbol *block_linkage_function (const struct block *);
-
extern struct symbol *block_containing_function (const struct block *);
/* Return true if block A is lexically nested within block B, or if a
@@ -91,7 +91,7 @@ get_pc_function_start (CORE_ADDR pc)
bl = block_for_pc (pc);
if (bl)
{
- struct symbol *symbol = block_linkage_function (bl);
+ struct symbol *symbol = bl->linkage_function ();
if (symbol)
{
@@ -139,7 +139,7 @@ find_pc_sect_function (CORE_ADDR pc, struct obj_section *section)
if (b == 0)
return 0;
- return block_linkage_function (b);
+ return b->linkage_function ();
}
/* Return the function containing pc value PC.
@@ -9194,7 +9194,7 @@ resolve_sal_pc (struct symtab_and_line *sal)
sal->symtab->compunit ());
if (bv != NULL)
{
- sym = block_linkage_function (b);
+ sym = b->linkage_function ();
if (sym != NULL)
{
fixup_symbol_section (sym, sal->symtab->compunit ()->objfile ());
@@ -892,7 +892,7 @@ do_compile_dwarf_expr_to_c (int indent, string_file *stream,
if (!b)
error (_("No block found for address"));
- framefunc = block_linkage_function (b);
+ framefunc = b->linkage_function ();
if (!framefunc)
error (_("No function found for block"));
@@ -771,7 +771,7 @@ dwarf_expr_context::get_frame_base (const gdb_byte **start,
/* Use block_linkage_function, which returns a real (not inlined)
function, instead of get_frame_function, which may return an
inlined function. */
- symbol *framefunc = block_linkage_function (bl);
+ symbol *framefunc = bl->linkage_function ();
/* If we found a frame-relative symbol then it was certainly within
some function associated with a frame. If we can't find the frame,
@@ -451,7 +451,7 @@ dwarf2_find_location_expression (struct dwarf2_loclist_baton *baton,
struct symbol *pc_func = NULL;
if (pc_block)
- pc_func = block_linkage_function (pc_block);
+ pc_func = pc_block->linkage_function ();
if (pc_func && pc == pc_func->value_block ()->entry_pc ())
{
@@ -2647,7 +2647,7 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr, struct axs_value *loc,
if (!b)
error (_("No block found for address"));
- framefunc = block_linkage_function (b);
+ framefunc = b->linkage_function ();
if (!framefunc)
error (_("No function found for block"));
@@ -3173,7 +3173,7 @@ locexpr_describe_location_piece (struct symbol *symbol, struct ui_file *stream,
error (_("No block found for address for symbol \"%s\"."),
symbol->print_name ());
- framefunc = block_linkage_function (b);
+ framefunc = b->linkage_function ();
if (!framefunc)
error (_("No function found for block for symbol \"%s\"."),
@@ -488,7 +488,7 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
the current frame language to parse the expression. That's why
we do the following language detection only if the context block
has been specifically provided. */
- struct symbol *func = block_linkage_function (block);
+ struct symbol *func = block->linkage_function ();
if (func != NULL)
lang = language_def (func->language ());