[PATCH 4/9] Remove addr_size field from struct piece_closure

Andreas Arnez
2017-04-07T17:41:48Z

The addr_size field in the piece_closure data structure is a relic from
before introducing the typed DWARF stack. It is obsolete now. This patch
removes it.

gdb/ChangeLog:

* dwarf2loc.c (struct piece_closure) <addr_size>: Remove field.
(allocate_piece_closure): Drop addr_size parameter.
(dwarf2_evaluate_loc_desc_full): Adjust call to
allocate_piece_closure.
---
gdb/dwarf2loc.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 09938c4..76a58a3 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -1485,9 +1485,6 @@ struct piece_closure
/* The number of pieces used to describe this variable. */
int n_pieces;

- /* The target address size, used only for DWARF_VALUE_STACK. */
- int addr_size;
-
/* The pieces themselves. */
struct dwarf_expr_piece *pieces;

@@ -1502,7 +1499,7 @@ struct piece_closure
static struct piece_closure *
allocate_piece_closure (struct dwarf2_per_cu_data *per_cu,
int n_pieces, struct dwarf_expr_piece *pieces,
- int addr_size, struct frame_info *frame)
+ struct frame_info *frame)
{
struct piece_closure *c = XCNEW (struct piece_closure);
int i;
@@ -1510,7 +1507,6 @@ allocate_piece_closure (struct dwarf2_per_cu_data *per_cu,
c->refc = 1;
c->per_cu = per_cu;
c->n_pieces = n_pieces;
- c->addr_size = addr_size;
c->pieces = XCNEWVEC (struct dwarf_expr_piece, n_pieces);
if (frame == NULL)
c->frame_id = null_frame_id;
@@ -2412,7 +2408,7 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
invalid_synthetic_pointer ();

c = allocate_piece_closure (per_cu, ctx.num_pieces, ctx.pieces,
- ctx.addr_size, frame);
+ frame);
/* We must clean up the value chain after creating the piece
closure but before allocating the result. */
free_values.free_to_mark ();
--
2.3.0