Rely on value_ref_ptr::operator->
Simon pointed out some spots were doing val.get()->mumble, where val is a value_ref_ptr. These were introduced by the function-to-method script, replacing older code that passed the result of .get() to a function. Now that value.h is using methods, we can instead rely on operator->. This patch replaces all the newly-introduced instances of this. Approved-By: Simon Marchi <simon.marchi@efficios.com>
This commit is contained in:
parent
736355f2e1
commit
f28085dfb4
6 changed files with 21 additions and 21 deletions
|
@ -943,7 +943,7 @@ static bool
|
||||||
ada_value_is_changeable_p (const struct varobj *var)
|
ada_value_is_changeable_p (const struct varobj *var)
|
||||||
{
|
{
|
||||||
struct type *type = (var->value != nullptr
|
struct type *type = (var->value != nullptr
|
||||||
? var->value.get ()->type () : var->type);
|
? var->value->type () : var->type);
|
||||||
|
|
||||||
if (type->code () == TYPE_CODE_REF)
|
if (type->code () == TYPE_CODE_REF)
|
||||||
type = type->target_type ();
|
type = type->target_type ();
|
||||||
|
|
|
@ -4415,7 +4415,7 @@ bpstat::bpstat (const bpstat &other)
|
||||||
print_it (other.print_it)
|
print_it (other.print_it)
|
||||||
{
|
{
|
||||||
if (other.old_val != NULL)
|
if (other.old_val != NULL)
|
||||||
old_val = release_value (other.old_val.get ()->copy ());
|
old_val = release_value (other.old_val->copy ());
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return a copy of a bpstat. Like "bs1 = bs2" but all storage that
|
/* Return a copy of a bpstat. Like "bs1 = bs2" but all storage that
|
||||||
|
@ -10316,7 +10316,7 @@ watch_command_1 (const char *arg, int accessflag, int from_tty,
|
||||||
w->cond_exp_valid_block = cond_exp_valid_block;
|
w->cond_exp_valid_block = cond_exp_valid_block;
|
||||||
if (just_location)
|
if (just_location)
|
||||||
{
|
{
|
||||||
struct type *t = val.get ()->type ();
|
struct type *t = val->type ();
|
||||||
CORE_ADDR addr = value_as_address (val.get ());
|
CORE_ADDR addr = value_as_address (val.get ());
|
||||||
|
|
||||||
w->exp_string_reparse
|
w->exp_string_reparse
|
||||||
|
|
|
@ -506,14 +506,14 @@ c_value_of_variable (const struct varobj *var,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (var->not_fetched && var->value.get ()->lazy ())
|
if (var->not_fetched && var->value->lazy ())
|
||||||
/* Frozen variable and no value yet. We don't
|
/* Frozen variable and no value yet. We don't
|
||||||
implicitly fetch the value. MI response will
|
implicitly fetch the value. MI response will
|
||||||
use empty string for the value, which is OK. */
|
use empty string for the value, which is OK. */
|
||||||
return std::string ();
|
return std::string ();
|
||||||
|
|
||||||
gdb_assert (varobj_value_is_changeable_p (var));
|
gdb_assert (varobj_value_is_changeable_p (var));
|
||||||
gdb_assert (!var->value.get ()->lazy ());
|
gdb_assert (!var->value->lazy ());
|
||||||
|
|
||||||
/* If the specified format is the current one,
|
/* If the specified format is the current one,
|
||||||
we can reuse print_value. */
|
we can reuse print_value. */
|
||||||
|
|
|
@ -1934,7 +1934,7 @@ x_command (const char *exp, int from_tty)
|
||||||
/* Make last address examined available to the user as $_. Use
|
/* Make last address examined available to the user as $_. Use
|
||||||
the correct pointer type. */
|
the correct pointer type. */
|
||||||
struct type *pointer_type
|
struct type *pointer_type
|
||||||
= lookup_pointer_type (last_examine_value.get ()->type ());
|
= lookup_pointer_type (last_examine_value->type ());
|
||||||
set_internalvar (lookup_internalvar ("_"),
|
set_internalvar (lookup_internalvar ("_"),
|
||||||
value_from_pointer (pointer_type,
|
value_from_pointer (pointer_type,
|
||||||
last_examine_address));
|
last_examine_address));
|
||||||
|
@ -1943,7 +1943,7 @@ x_command (const char *exp, int from_tty)
|
||||||
as $__. If the last value has not been fetched from memory
|
as $__. If the last value has not been fetched from memory
|
||||||
then don't fetch it now; instead mark it by voiding the $__
|
then don't fetch it now; instead mark it by voiding the $__
|
||||||
variable. */
|
variable. */
|
||||||
if (last_examine_value.get ()->lazy ())
|
if (last_examine_value->lazy ())
|
||||||
clear_internalvar (lookup_internalvar ("__"));
|
clear_internalvar (lookup_internalvar ("__"));
|
||||||
else
|
else
|
||||||
set_internalvar (lookup_internalvar ("__"), last_examine_value.get ());
|
set_internalvar (lookup_internalvar ("__"), last_examine_value.get ());
|
||||||
|
|
14
gdb/value.c
14
gdb/value.c
|
@ -1347,7 +1347,7 @@ value::address () const
|
||||||
if (m_lval != lval_memory)
|
if (m_lval != lval_memory)
|
||||||
return 0;
|
return 0;
|
||||||
if (m_parent != NULL)
|
if (m_parent != NULL)
|
||||||
return m_parent.get ()->address () + m_offset;
|
return m_parent->address () + m_offset;
|
||||||
if (NULL != TYPE_DATA_LOCATION (type ()))
|
if (NULL != TYPE_DATA_LOCATION (type ()))
|
||||||
{
|
{
|
||||||
gdb_assert (PROP_CONST == TYPE_DATA_LOCATION_KIND (type ()));
|
gdb_assert (PROP_CONST == TYPE_DATA_LOCATION_KIND (type ()));
|
||||||
|
@ -1707,7 +1707,7 @@ access_value_history (int num)
|
||||||
|
|
||||||
absnum--;
|
absnum--;
|
||||||
|
|
||||||
return value_history[absnum].get ()->copy ();
|
return value_history[absnum]->copy ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* See value.h. */
|
/* See value.h. */
|
||||||
|
@ -2400,7 +2400,7 @@ preserve_one_varobj (struct varobj *varobj, struct objfile *objfile,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (varobj->value != nullptr)
|
if (varobj->value != nullptr)
|
||||||
varobj->value.get ()->preserve (objfile, copied_types);
|
varobj->value->preserve (objfile, copied_types);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Update the internal variables and value history when OBJFILE is
|
/* Update the internal variables and value history when OBJFILE is
|
||||||
|
@ -2419,7 +2419,7 @@ preserve_values (struct objfile *objfile)
|
||||||
htab_up copied_types = create_copied_types_hash ();
|
htab_up copied_types = create_copied_types_hash ();
|
||||||
|
|
||||||
for (const value_ref_ptr &item : value_history)
|
for (const value_ref_ptr &item : value_history)
|
||||||
item.get ()->preserve (objfile, copied_types.get ());
|
item->preserve (objfile, copied_types.get ());
|
||||||
|
|
||||||
for (var = internalvars; var; var = var->next)
|
for (var = internalvars; var; var = var->next)
|
||||||
preserve_one_internalvar (var, objfile, copied_types.get ());
|
preserve_one_internalvar (var, objfile, copied_types.get ());
|
||||||
|
@ -4097,10 +4097,10 @@ test_value_copy ()
|
||||||
/* Verify that we can copy an entirely optimized out value, that may not have
|
/* Verify that we can copy an entirely optimized out value, that may not have
|
||||||
its contents allocated. */
|
its contents allocated. */
|
||||||
value_ref_ptr val = release_value (value::allocate_optimized_out (type));
|
value_ref_ptr val = release_value (value::allocate_optimized_out (type));
|
||||||
value_ref_ptr copy = release_value (val.get ()->copy ());
|
value_ref_ptr copy = release_value (val->copy ());
|
||||||
|
|
||||||
SELF_CHECK (val.get ()->entirely_optimized_out ());
|
SELF_CHECK (val->entirely_optimized_out ());
|
||||||
SELF_CHECK (copy.get ()->entirely_optimized_out ());
|
SELF_CHECK (copy->entirely_optimized_out ());
|
||||||
}
|
}
|
||||||
|
|
||||||
} /* namespace selftests */
|
} /* namespace selftests */
|
||||||
|
|
14
gdb/varobj.c
14
gdb/varobj.c
|
@ -504,7 +504,7 @@ varobj_set_display_format (struct varobj *var,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (varobj_value_is_changeable_p (var)
|
if (varobj_value_is_changeable_p (var)
|
||||||
&& var->value != nullptr && !var->value.get ()->lazy ())
|
&& var->value != nullptr && !var->value->lazy ())
|
||||||
{
|
{
|
||||||
var->print_value = varobj_value_get_print_value (var->value.get (),
|
var->print_value = varobj_value_get_print_value (var->value.get (),
|
||||||
var->format, var);
|
var->format, var);
|
||||||
|
@ -1007,7 +1007,7 @@ varobj_set_value (struct varobj *var, const char *expression)
|
||||||
gdb_assert (varobj_value_is_changeable_p (var));
|
gdb_assert (varobj_value_is_changeable_p (var));
|
||||||
|
|
||||||
/* The value of a changeable variable object must not be lazy. */
|
/* The value of a changeable variable object must not be lazy. */
|
||||||
gdb_assert (!var->value.get ()->lazy ());
|
gdb_assert (!var->value->lazy ());
|
||||||
|
|
||||||
/* Need to coerce the input. We want to check if the
|
/* Need to coerce the input. We want to check if the
|
||||||
value of the variable object will be different
|
value of the variable object will be different
|
||||||
|
@ -1312,7 +1312,7 @@ install_new_value (struct varobj *var, struct value *value, bool initial)
|
||||||
{
|
{
|
||||||
/* Try to compare the values. That requires that both
|
/* Try to compare the values. That requires that both
|
||||||
values are non-lazy. */
|
values are non-lazy. */
|
||||||
if (var->not_fetched && var->value.get ()->lazy ())
|
if (var->not_fetched && var->value->lazy ())
|
||||||
{
|
{
|
||||||
/* This is a frozen varobj and the value was never read.
|
/* This is a frozen varobj and the value was never read.
|
||||||
Presumably, UI shows some "never read" indicator.
|
Presumably, UI shows some "never read" indicator.
|
||||||
|
@ -1330,7 +1330,7 @@ install_new_value (struct varobj *var, struct value *value, bool initial)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
gdb_assert (!var->value.get ()->lazy ());
|
gdb_assert (!var->value->lazy ());
|
||||||
gdb_assert (!value->lazy ());
|
gdb_assert (!value->lazy ());
|
||||||
|
|
||||||
gdb_assert (!var->print_value.empty () && !print_value.empty ());
|
gdb_assert (!var->print_value.empty () && !print_value.empty ());
|
||||||
|
@ -1370,7 +1370,7 @@ install_new_value (struct varobj *var, struct value *value, bool initial)
|
||||||
}
|
}
|
||||||
var->print_value = print_value;
|
var->print_value = print_value;
|
||||||
|
|
||||||
gdb_assert (var->value == nullptr || var->value.get ()->type ());
|
gdb_assert (var->value == nullptr || var->value->type ());
|
||||||
|
|
||||||
return changed;
|
return changed;
|
||||||
}
|
}
|
||||||
|
@ -1886,7 +1886,7 @@ varobj_get_value_type (const struct varobj *var)
|
||||||
struct type *type;
|
struct type *type;
|
||||||
|
|
||||||
if (var->value != nullptr)
|
if (var->value != nullptr)
|
||||||
type = var->value.get ()->type ();
|
type = var->value->type ();
|
||||||
else
|
else
|
||||||
type = var->type;
|
type = var->type;
|
||||||
|
|
||||||
|
@ -2270,7 +2270,7 @@ varobj_editable_p (const struct varobj *var)
|
||||||
struct type *type;
|
struct type *type;
|
||||||
|
|
||||||
if (!(var->root->is_valid && var->value != nullptr
|
if (!(var->root->is_valid && var->value != nullptr
|
||||||
&& var->value.get ()->lval ()))
|
&& var->value->lval ()))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
type = varobj_get_value_type (var);
|
type = varobj_get_value_type (var);
|
||||||
|
|
Loading…
Add table
Reference in a new issue