diff options
Diffstat (limited to 'gdb/value.c')
| -rw-r--r-- | gdb/value.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdb/value.c b/gdb/value.c index 01c30eb3f93..980722a6dd7 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1362,7 +1362,7 @@ value::address () const return m_parent->address () + m_offset; if (NULL != TYPE_DATA_LOCATION (type ())) { - gdb_assert (PROP_CONST == TYPE_DATA_LOCATION_KIND (type ())); + gdb_assert (TYPE_DATA_LOCATION (type ())->is_constant ()); return TYPE_DATA_LOCATION_ADDR (type ()); } @@ -1612,14 +1612,14 @@ value::set_component_location (const struct value *whole) update the address of the COMPONENT. */ type = whole->type (); if (NULL != TYPE_DATA_LOCATION (type) - && TYPE_DATA_LOCATION_KIND (type) == PROP_CONST) + && TYPE_DATA_LOCATION (type)->is_constant ()) set_address (TYPE_DATA_LOCATION_ADDR (type)); /* Similarly, if the COMPONENT value has a dynamically resolved location property then update its address. */ type = this->type (); if (NULL != TYPE_DATA_LOCATION (type) - && TYPE_DATA_LOCATION_KIND (type) == PROP_CONST) + && TYPE_DATA_LOCATION (type)->is_constant ()) { /* If the COMPONENT has a dynamic location, and is an lval_internalvar_component, then we change it to a lval_memory. @@ -3005,7 +3005,7 @@ value::primitive_field (LONGEST offset, int fieldno, struct type *arg_type) gdb_assert (0 == offset); /* We expect an already resolved data location. */ - gdb_assert (PROP_CONST == TYPE_DATA_LOCATION_KIND (type)); + gdb_assert (TYPE_DATA_LOCATION (type)->is_constant ()); /* For dynamic data types defer memory allocation until we actual access the value. */ v = value::allocate_lazy (type); @@ -3558,7 +3558,7 @@ value_from_contents_and_address (struct type *type, else v = value_from_contents (resolved_type, valaddr); if (TYPE_DATA_LOCATION (resolved_type_no_typedef) != NULL - && TYPE_DATA_LOCATION_KIND (resolved_type_no_typedef) == PROP_CONST) + && TYPE_DATA_LOCATION (resolved_type_no_typedef)->is_constant ()) address = TYPE_DATA_LOCATION_ADDR (resolved_type_no_typedef); v->set_lval (lval_memory); v->set_address (address); |