FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change value::parent to a value_ref_ptr

Browse source 
This changes value::parent to a value_ref_ptr.  This removes a bit of
manual reference count management.

gdb/ChangeLog
2018-04-06  Tom Tromey  <tom@tromey.com>

	* value.c (~value): Update.
	(struct value) <parent>: Now a value_ref_ptr.
	(value_parent, set_value_parent, value_address, value_copy):
	Update.
This commit is contained in:
Tom Tromey 2018-04-04 16:08:42 -06:00
parent 466ce3aea9
commit 2c8331b987
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gdb/ChangeLog
View file

@ -1,3 +1,10 @@
2018-04-06 Tom Tromey <tom@tromey.com>
* value.c (~value): Update.
(struct value) <parent>: Now a value_ref_ptr.
(value_parent, set_value_parent, value_address, value_copy):
Update.
2018-04-06 Tom Tromey <tom@tromey.com> 2018-04-06 Tom Tromey <tom@tromey.com>
* value.c (struct value): Add constructor, destructor, and member * value.c (struct value): Add constructor, destructor, and member

20
gdb/value.c
View file

@ -181,11 +181,6 @@ struct value
~value () ~value ()
{ {
/* If there's an associated parent value, drop our reference to
it. */
if (parent != NULL)
value_decref (parent);
if (VALUE_LVAL (this) == lval_computed) if (VALUE_LVAL (this) == lval_computed)
{ {
const struct lval_funcs *funcs = location.computed.funcs; const struct lval_funcs *funcs = location.computed.funcs;
@ -292,7 +287,7 @@ struct value
/* Only used for bitfields; the containing value. This allows a /* Only used for bitfields; the containing value. This allows a
single read from the target when displaying multiple single read from the target when displaying multiple
bitfields. */ bitfields. */
struct value *parent = nullptr; value_ref_ptr parent;
/* Type of the value. */ /* Type of the value. */
struct type *type; struct type *type;
@ -1128,7 +1123,7 @@ set_value_bitsize (struct value *value, LONGEST bit)
struct value * struct value *
value_parent (const struct value *value) value_parent (const struct value *value)
{ {
return value->parent; return value->parent.get ();
} }
/* See value.h. */ /* See value.h. */
@ -1136,12 +1131,7 @@ value_parent (const struct value *value)
void void
set_value_parent (struct value *value, struct value *parent) set_value_parent (struct value *value, struct value *parent)
{ {
struct value *old = value->parent; value->parent = value_ref_ptr (value_incref (parent));
value->parent = parent;
if (parent != NULL)
value_incref (parent);
value_decref (old);
} }
gdb_byte * gdb_byte *
@ -1521,7 +1511,7 @@ value_address (const struct value *value)
if (value->lval != lval_memory) if (value->lval != lval_memory)
return 0; return 0;
if (value->parent != NULL) if (value->parent != NULL)
return value_address (value->parent) + value->offset; return value_address (value->parent.get ()) + value->offset;
if (NULL != TYPE_DATA_LOCATION (value_type (value))) if (NULL != TYPE_DATA_LOCATION (value_type (value)))
{ {
gdb_assert (PROP_CONST == TYPE_DATA_LOCATION_KIND (value_type (value))); gdb_assert (PROP_CONST == TYPE_DATA_LOCATION_KIND (value_type (value)));
@ -1700,7 +1690,7 @@ value_copy (struct value *arg)
} }
val->unavailable = VEC_copy (range_s, arg->unavailable); val->unavailable = VEC_copy (range_s, arg->unavailable);
val->optimized_out = VEC_copy (range_s, arg->optimized_out); val->optimized_out = VEC_copy (range_s, arg->optimized_out);
set_value_parent (val, arg->parent); val->parent = arg->parent;
if (VALUE_LVAL (val) == lval_computed) if (VALUE_LVAL (val) == lval_computed)
{ {
const struct lval_funcs *funcs = val->location.computed.funcs; const struct lval_funcs *funcs = val->location.computed.funcs;