[PATCH v2 27/42] Add dwarf2_per_objfile parameters to dwarf2_fetch_* functions

Simon Marchi
2020-05-12T21:15:19Z

This allows removing dwarf2_per_cu_data references.

gdb/ChangeLog:

* dwarf2/read.h (dwarf2_fetch_die_loc_sect_off,
dwarf2_fetch_die_loc_cu_off, dwarf2_fetch_constant_bytes,
dwarf2_fetch_die_type_sect_off): Add dwarf2_per_objfile
parameter.
* dwarf2/read.c (dwarf2_fetch_die_loc_sect_off,
dwarf2_fetch_die_loc_cu_off, dwarf2_fetch_constant_bytes,
dwarf2_fetch_die_type_sect_off): Add dwarf2_per_objfile
parameter.
* dwarf2/loc.c (indirect_synthetic_pointer, per_cu_dwarf_call,
sect_variable_value): Add dwarf2_per_objfile parameter.
(class dwarf_evaluate_loc_desc) <dwarf_call,
dwarf_variable_value>: Update.
(fetch_const_value_from_synthetic_pointer): Add
dwarf2_per_objfile parameter.
(fetch_const_value_from_synthetic_pointer): Update.
(coerced_pieced_ref): Update.
(class symbol_needs_eval_context) <dwarf_call,
dwarf_variable_value>: Update.
(dwarf2_compile_expr_to_ax): Update.
---
gdb/dwarf2/loc.c | 46 +++++++++++++++++++++++++++-------------------
gdb/dwarf2/read.c | 16 ++++++++++------
gdb/dwarf2/read.h | 8 ++++++--
3 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
index 4b320408ab1..c1ccbda8235 100644
--- a/gdb/dwarf2/loc.c
+++ b/gdb/dwarf2/loc.c
@@ -63,7 +63,8 @@ static struct call_site_parameter *dwarf_expr_reg_to_entry_parameter

static struct value *indirect_synthetic_pointer
(sect_offset die, LONGEST byte_offset,
- struct dwarf2_per_cu_data *per_cu,
+ dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile,
struct frame_info *frame,
struct type *type, bool resolve_abstract_p = false);

@@ -581,11 +582,11 @@ get_frame_pc_for_per_cu_dwarf_call (void *baton)

static void
per_cu_dwarf_call (struct dwarf_expr_context *ctx, cu_offset die_offset,
- struct dwarf2_per_cu_data *per_cu)
+ dwarf2_per_cu_data *per_cu, dwarf2_per_objfile *per_objfile)
{
struct dwarf2_locexpr_baton block;

- block = dwarf2_fetch_die_loc_cu_off (die_offset, per_cu,
+ block = dwarf2_fetch_die_loc_cu_off (die_offset, per_cu, per_objfile,
get_frame_pc_for_per_cu_dwarf_call,
ctx);

@@ -601,9 +602,11 @@ per_cu_dwarf_call (struct dwarf_expr_context *ctx, cu_offset die_offset,

static struct value *
sect_variable_value (struct dwarf_expr_context *ctx, sect_offset sect_off,
- struct dwarf2_per_cu_data *per_cu)
+ dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile)
{
- struct type *die_type = dwarf2_fetch_die_type_sect_off (sect_off, per_cu);
+ struct type *die_type
+ = dwarf2_fetch_die_type_sect_off (sect_off, per_cu, per_objfile);

if (die_type == NULL)
error (_("Bad DW_OP_GNU_variable_value DIE."));
@@ -616,7 +619,8 @@ sect_variable_value (struct dwarf_expr_context *ctx, sect_offset sect_off,

struct type *type = lookup_pointer_type (die_type);
struct frame_info *frame = get_selected_frame (_("No frame selected."));
- return indirect_synthetic_pointer (sect_off, 0, per_cu, frame, type, true);
+ return indirect_synthetic_pointer (sect_off, 0, per_cu, per_objfile, frame,
+ type, true);
}

class dwarf_evaluate_loc_desc : public dwarf_expr_context
@@ -660,7 +664,7 @@ class dwarf_evaluate_loc_desc : public dwarf_expr_context

void dwarf_call (cu_offset die_offset) override
{
- per_cu_dwarf_call (this, die_offset, per_cu);
+ per_cu_dwarf_call (this, die_offset, per_cu, per_objfile);
}

/* Helper interface of sect_variable_value for
@@ -668,7 +672,7 @@ class dwarf_evaluate_loc_desc : public dwarf_expr_context

struct value *dwarf_variable_value (sect_offset sect_off) override
{
- return sect_variable_value (this, sect_off, per_cu);
+ return sect_variable_value (this, sect_off, per_cu, per_objfile);
}

struct type *get_base_type (cu_offset die_offset, int size) override
@@ -1963,7 +1967,8 @@ get_frame_address_in_block_wrapper (void *baton)

static struct value *
fetch_const_value_from_synthetic_pointer (sect_offset die, LONGEST byte_offset,
- struct dwarf2_per_cu_data *per_cu,
+ dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile,
struct type *type)
{
struct value *result = NULL;
@@ -1971,7 +1976,8 @@ fetch_const_value_from_synthetic_pointer (sect_offset die, LONGEST byte_offset,
LONGEST len;

auto_obstack temp_obstack;
- bytes = dwarf2_fetch_constant_bytes (die, per_cu, &temp_obstack, &len);
+ bytes = dwarf2_fetch_constant_bytes (die, per_cu, per_objfile,
+ &temp_obstack, &len);

if (bytes != NULL)
{
@@ -1994,18 +2000,20 @@ fetch_const_value_from_synthetic_pointer (sect_offset die, LONGEST byte_offset,

static struct value *
indirect_synthetic_pointer (sect_offset die, LONGEST byte_offset,
- struct dwarf2_per_cu_data *per_cu,
+ dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile,
struct frame_info *frame, struct type *type,
bool resolve_abstract_p)
{
/* Fetch the location expression of the DIE we're pointing to. */
struct dwarf2_locexpr_baton baton
- = dwarf2_fetch_die_loc_sect_off (die, per_cu,
+ = dwarf2_fetch_die_loc_sect_off (die, per_cu, per_objfile,
get_frame_address_in_block_wrapper, frame,
resolve_abstract_p);

/* Get type of pointed-to DIE. */
- struct type *orig_type = dwarf2_fetch_die_type_sect_off (die, per_cu);
+ struct type *orig_type = dwarf2_fetch_die_type_sect_off (die, per_cu,
+ per_objfile);
if (orig_type == NULL)
invalid_synthetic_pointer ();

@@ -2019,7 +2027,7 @@ indirect_synthetic_pointer (sect_offset die, LONGEST byte_offset,
byte_offset);
else
return fetch_const_value_from_synthetic_pointer (die, byte_offset, per_cu,
- type);
+ per_objfile, type);
}

/* An implementation of an lval_funcs method to indirect through a
@@ -2096,7 +2104,7 @@ indirect_pieced_value (struct value *value)

return indirect_synthetic_pointer (piece->v.ptr.die_sect_off,
byte_offset, c->per_cu,
- frame, type);
+ c->per_objfile, frame, type);
}

/* Implementation of the coerce_ref method of lval_funcs for synthetic C++
@@ -2123,7 +2131,7 @@ coerce_pieced_ref (const struct value *value)
return indirect_synthetic_pointer
(closure->pieces[0].v.ptr.die_sect_off,
closure->pieces[0].v.ptr.offset,
- closure->per_cu, frame, type);
+ closure->per_cu, closure->per_objfile, frame, type);
}
else
{
@@ -2752,7 +2760,7 @@ class symbol_needs_eval_context : public dwarf_expr_context

void dwarf_call (cu_offset die_offset) override
{
- per_cu_dwarf_call (this, die_offset, per_cu);
+ per_cu_dwarf_call (this, die_offset, per_cu, per_objfile);
}

/* Helper interface of sect_variable_value for
@@ -2760,7 +2768,7 @@ class symbol_needs_eval_context : public dwarf_expr_context

struct value *dwarf_variable_value (sect_offset sect_off) override
{
- return sect_variable_value (this, sect_off, per_cu);
+ return sect_variable_value (this, sect_off, per_cu, per_objfile);
}

/* DW_OP_entry_value accesses require a caller, therefore a
@@ -3589,7 +3597,7 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr, struct axs_value *loc,
op_ptr += size;

cu_offset cuoffset = (cu_offset) uoffset;
- block = dwarf2_fetch_die_loc_cu_off (cuoffset, per_cu,
+ block = dwarf2_fetch_die_loc_cu_off (cuoffset, per_cu, per_objfile,
get_ax_pc, expr);

/* DW_OP_call_ref is currently not supported. */
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 172e4f19e3b..d221d0148c0 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -22260,6 +22260,7 @@ follow_die_ref (struct die_info *src_die, const struct attribute *attr,
struct dwarf2_locexpr_baton
dwarf2_fetch_die_loc_sect_off (sect_offset sect_off,
dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *dwarf2_per_objfile,
CORE_ADDR (*get_frame_pc) (void *baton),
void *baton, bool resolve_abstract_p)
{
@@ -22267,7 +22268,6 @@ dwarf2_fetch_die_loc_sect_off (sect_offset sect_off,
struct die_info *die;
struct attribute *attr;
struct dwarf2_locexpr_baton retval;
- struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile;
struct objfile *objfile = dwarf2_per_objfile->objfile;

if (per_cu->cu == NULL)
@@ -22364,12 +22364,14 @@ dwarf2_fetch_die_loc_sect_off (sect_offset sect_off,
struct dwarf2_locexpr_baton
dwarf2_fetch_die_loc_cu_off (cu_offset offset_in_cu,
dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile,
CORE_ADDR (*get_frame_pc) (void *baton),
void *baton)
{
sect_offset sect_off = per_cu->sect_off + to_underlying (offset_in_cu);

- return dwarf2_fetch_die_loc_sect_off (sect_off, per_cu, get_frame_pc, baton);
+ return dwarf2_fetch_die_loc_sect_off (sect_off, per_cu, per_objfile,
+ get_frame_pc, baton);
}

/* Write a constant of a given type as target-ordered bytes into
@@ -22396,6 +22398,7 @@ write_constant_as_bytes (struct obstack *obstack,
const gdb_byte *
dwarf2_fetch_constant_bytes (sect_offset sect_off,
dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile,
obstack *obstack,
LONGEST *len)
{
@@ -22406,10 +22409,10 @@ dwarf2_fetch_constant_bytes (sect_offset sect_off,
struct type *type;
LONGEST value;
enum bfd_endian byte_order;
- struct objfile *objfile = per_cu->dwarf2_per_objfile->objfile;
+ struct objfile *objfile = per_objfile->objfile;

if (per_cu->cu == NULL)
- load_cu (per_cu, per_cu->dwarf2_per_objfile, false);
+ load_cu (per_cu, per_objfile, false);
cu = per_cu->cu;
if (cu == NULL)
{
@@ -22525,13 +22528,14 @@ dwarf2_fetch_constant_bytes (sect_offset sect_off,

struct type *
dwarf2_fetch_die_type_sect_off (sect_offset sect_off,
- dwarf2_per_cu_data *per_cu)
+ dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile)
{
struct dwarf2_cu *cu;
struct die_info *die;

if (per_cu->cu == NULL)
- load_cu (per_cu, per_cu->dwarf2_per_objfile, false);
+ load_cu (per_cu, per_objfile, false);
cu = per_cu->cu;
if (!cu)
return NULL;
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 68e322f8bbe..c6d236b4778 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -589,6 +589,7 @@ CORE_ADDR dwarf2_read_addr_index (dwarf2_per_cu_data *per_cu,

struct dwarf2_locexpr_baton dwarf2_fetch_die_loc_sect_off
(sect_offset sect_off, dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile,
CORE_ADDR (*get_frame_pc) (void *baton),
void *baton, bool resolve_abstract_p = false);

@@ -597,6 +598,7 @@ struct dwarf2_locexpr_baton dwarf2_fetch_die_loc_sect_off

struct dwarf2_locexpr_baton dwarf2_fetch_die_loc_cu_off
(cu_offset offset_in_cu, dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile,
CORE_ADDR (*get_frame_pc) (void *baton),
void *baton);

@@ -606,14 +608,16 @@ struct dwarf2_locexpr_baton dwarf2_fetch_die_loc_cu_off
does not have a DW_AT_const_value, return NULL. */

extern const gdb_byte *dwarf2_fetch_constant_bytes
- (sect_offset sect_off, dwarf2_per_cu_data *per_cu, obstack *obstack,
+ (sect_offset sect_off, dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile, obstack *obstack,
LONGEST *len);

/* Return the type of the die at SECT_OFF in PER_CU. Return NULL if no
valid type for this die is found. */

struct type *dwarf2_fetch_die_type_sect_off
- (sect_offset sect_off, dwarf2_per_cu_data *per_cu);
+ (sect_offset sect_off, dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile);

/* When non-zero, dump line number entries as they are read in. */
extern unsigned int dwarf_line_debug;
--
2.26.2