forked from Imagelibrary/binutils-gdb
gdb/
Remove excessive DWARF expressions memory duplication. * dwarf2loc.c (per_cu_dwarf_call): Remove variable back_to and its use for block.data. (indirect_pieced_value): Remove variable result. Remove variable back_to and its use for baton.data. (dwarf2_compile_expr_to_ax): Remove variable back_to and its use for block.data. * dwarf2read.c (dwarf2_fetch_die_location_block): Remove xmemdup. Update the function comment.
This commit is contained in:
@@ -265,19 +265,14 @@ per_cu_dwarf_call (struct dwarf_expr_context *ctx, size_t die_offset,
|
||||
void *baton)
|
||||
{
|
||||
struct dwarf2_locexpr_baton block;
|
||||
struct cleanup *back_to;
|
||||
|
||||
block = dwarf2_fetch_die_location_block (die_offset, per_cu,
|
||||
get_frame_pc, baton);
|
||||
|
||||
back_to = make_cleanup (xfree, (void *) block.data);
|
||||
|
||||
/* DW_OP_call_ref is currently not supported. */
|
||||
gdb_assert (block.per_cu == per_cu);
|
||||
|
||||
dwarf_expr_eval (ctx, block.data, block.size);
|
||||
|
||||
do_cleanups (back_to);
|
||||
}
|
||||
|
||||
/* Helper interface of per_cu_dwarf_call for dwarf2_evaluate_loc_desc. */
|
||||
@@ -969,9 +964,7 @@ indirect_pieced_value (struct value *value)
|
||||
struct dwarf2_locexpr_baton baton;
|
||||
int i, bit_offset, bit_length;
|
||||
struct dwarf_expr_piece *piece = NULL;
|
||||
struct value *result;
|
||||
LONGEST byte_offset;
|
||||
struct cleanup *back_to;
|
||||
|
||||
type = check_typedef (value_type (value));
|
||||
if (TYPE_CODE (type) != TYPE_CODE_PTR)
|
||||
@@ -1021,15 +1014,9 @@ indirect_pieced_value (struct value *value)
|
||||
get_frame_address_in_block_wrapper,
|
||||
frame);
|
||||
|
||||
back_to = make_cleanup (xfree, (void *) baton.data);
|
||||
|
||||
result = dwarf2_evaluate_loc_desc_full (TYPE_TARGET_TYPE (type), frame,
|
||||
baton.data, baton.size, baton.per_cu,
|
||||
piece->v.ptr.offset + byte_offset);
|
||||
|
||||
do_cleanups (back_to);
|
||||
|
||||
return result;
|
||||
return dwarf2_evaluate_loc_desc_full (TYPE_TARGET_TYPE (type), frame,
|
||||
baton.data, baton.size, baton.per_cu,
|
||||
piece->v.ptr.offset + byte_offset);
|
||||
}
|
||||
|
||||
static void *
|
||||
@@ -2147,14 +2134,12 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr, struct axs_value *loc,
|
||||
{
|
||||
struct dwarf2_locexpr_baton block;
|
||||
int size = (op == DW_OP_call2 ? 2 : 4);
|
||||
struct cleanup *back_to;
|
||||
|
||||
uoffset = extract_unsigned_integer (op_ptr, size, byte_order);
|
||||
op_ptr += size;
|
||||
|
||||
block = dwarf2_fetch_die_location_block (uoffset, per_cu,
|
||||
get_ax_pc, expr);
|
||||
back_to = make_cleanup (xfree, (void *) block.data);
|
||||
|
||||
/* DW_OP_call_ref is currently not supported. */
|
||||
gdb_assert (block.per_cu == per_cu);
|
||||
@@ -2162,8 +2147,6 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr, struct axs_value *loc,
|
||||
dwarf2_compile_expr_to_ax (expr, loc, arch, addr_size,
|
||||
block.data, block.data + block.size,
|
||||
per_cu);
|
||||
|
||||
do_cleanups (back_to);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user