From 81ae560ca4f0da47729dc37a889c2f2e01c4c84e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 31 Jan 2023 08:24:35 -0700 Subject: [PATCH] Turn deprecated_set_value_type into a method This changes deprecated_set_value_type to be a method of value. Much of this patch was written by script. Approved-By: Simon Marchi --- gdb/ada-lang.c | 6 +++--- gdb/ada-valprint.c | 2 +- gdb/eval.c | 2 +- gdb/gnu-v2-abi.c | 3 +-- gdb/i386-tdep.c | 2 +- gdb/objc-lang.c | 2 +- gdb/valops.c | 19 +++++++++---------- gdb/value.c | 11 ++--------- gdb/value.h | 13 ++++++------- 9 files changed, 25 insertions(+), 35 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index da49149c56d..c5b5b14163b 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -2924,7 +2924,7 @@ ada_value_assign (struct value *toval, struct value *fromval) memcpy (value_contents_raw (val).data (), value_contents (fromval).data (), type->length ()); - deprecated_set_value_type (val, type); + val->deprecated_set_type (type); return val; } @@ -3033,7 +3033,7 @@ ada_value_subscript (struct value *arr, int arity, struct value **ind) than as an access. Another symptom of the same issue would be that an expression trying to dereference the element would also be improperly rejected. */ - deprecated_set_value_type (elt, saved_elt_type); + elt->deprecated_set_type (saved_elt_type); } elt_type = ada_check_typedef (elt->type ()); @@ -9334,7 +9334,7 @@ coerce_for_assign (struct type *type, struct value *val) if (type2->target_type ()->length () != type->target_type ()->length ()) error (_("Incompatible types in assignment")); - deprecated_set_value_type (val, type); + val->deprecated_set_type (type); } return val; } diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index 1f22ab61ce2..761d3150937 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -1029,7 +1029,7 @@ ada_value_print_inner (struct value *val, struct ui_file *stream, int recurse, if (type != saved_type) { val = value_copy (val); - deprecated_set_value_type (val, type); + val->deprecated_set_type (type); } if (is_fixed_point_type (type)) diff --git a/gdb/eval.c b/gdb/eval.c index c24ff258b43..6fa359966ec 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2183,7 +2183,7 @@ eval_op_objc_msgcall (struct type *expect_type, struct expression *exp, /* Function objc_msg_lookup returns a pointer. */ struct type *tem_type = called_method->type (); tem_type = lookup_pointer_type (lookup_function_type (tem_type)); - deprecated_set_value_type (called_method, tem_type); + called_method->deprecated_set_type (tem_type); called_method = call_function_by_hand (called_method, NULL, args); } diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c index c28df183c8b..b27649051a4 100644 --- a/gdb/gnu-v2-abi.c +++ b/gdb/gnu-v2-abi.c @@ -174,8 +174,7 @@ gnuv2_virtual_fn_field (struct value **arg1p, struct fn_field * f, int j, else error (_("I'm confused: virtual function table has bad type")); /* Reinstantiate the function pointer with the correct type. */ - deprecated_set_value_type (vfn, - lookup_pointer_type (TYPE_FN_FIELD_TYPE (f, j))); + vfn->deprecated_set_type (lookup_pointer_type (TYPE_FN_FIELD_TYPE (f, j))); *arg1p = arg1; return vfn; diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index b799ac5ee27..090f5468067 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -3087,7 +3087,7 @@ i386_return_value (struct gdbarch *gdbarch, struct value *function, = i386_return_value (gdbarch, function, inner_type, regcache, read_value, writebuf); if (read_value != nullptr) - deprecated_set_value_type (*read_value, type); + (*read_value)->deprecated_set_type (type); return result; } diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index e17a4c406c0..f43d158a770 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -212,7 +212,7 @@ value_nsstring (struct gdbarch *gdbarch, const char *ptr, int len) else type = lookup_pointer_type(sym->type ()); - deprecated_set_value_type (nsstringValue, type); + nsstringValue->deprecated_set_type (type); return nsstringValue; } diff --git a/gdb/valops.c b/gdb/valops.c index a56afce0235..1cac2496183 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -319,14 +319,14 @@ value_cast_pointers (struct type *type, struct value *arg2, { struct value *v = value_addr (v2); - deprecated_set_value_type (v, type); + v->deprecated_set_type (type); return v; } } /* No superclass found, just change the pointer type. */ arg2 = value_copy (arg2); - deprecated_set_value_type (arg2, type); + arg2->deprecated_set_type (type); set_value_enclosing_type (arg2, type); set_value_pointed_to_offset (arg2, 0); /* pai: chk_val */ return arg2; @@ -429,7 +429,7 @@ value_cast (struct type *type, struct value *arg2) if (arg2->type () != type) { arg2 = value_copy (arg2); - deprecated_set_value_type (arg2, type); + arg2->deprecated_set_type (type); } return arg2; } @@ -494,8 +494,7 @@ value_cast (struct type *type, struct value *arg2) range_type->target_type (), low_bound, new_length + low_bound - 1); - deprecated_set_value_type (arg2, - create_array_type (NULL, + arg2->deprecated_set_type (create_array_type (NULL, element_type, range_type)); return arg2; @@ -649,7 +648,7 @@ value_cast (struct type *type, struct value *arg2) return value_cast_pointers (to_type, arg2, 0); arg2 = value_copy (arg2); - deprecated_set_value_type (arg2, to_type); + arg2->deprecated_set_type (to_type); set_value_enclosing_type (arg2, to_type); set_value_pointed_to_offset (arg2, 0); /* pai: chk_val */ return arg2; @@ -1574,7 +1573,7 @@ value_addr (struct value *arg1) = lookup_pointer_type (enclosing_type->target_type ()); arg2 = value_copy (arg1); - deprecated_set_value_type (arg2, type_ptr); + arg2->deprecated_set_type (type_ptr); set_value_enclosing_type (arg2, enclosing_type_ptr); return arg2; @@ -1622,7 +1621,7 @@ value_ref (struct value *arg1, enum type_code refcode) return arg1; arg2 = value_addr (arg1); - deprecated_set_value_type (arg2, lookup_reference_type (type, refcode)); + arg2->deprecated_set_type (lookup_reference_type (type, refcode)); return arg2; } @@ -2110,7 +2109,7 @@ struct_field_searcher::search (struct value *arg1, LONGEST offset, else { v2 = value_copy (arg1); - deprecated_set_value_type (v2, basetype); + v2->deprecated_set_type (basetype); set_value_embedded_offset (v2, boffset); } @@ -3981,7 +3980,7 @@ value_full_object (struct value *argp, value_rtti_type used for its computation. */ new_val = value_at_lazy (real_type, value_address (argp) - top + (using_enc ? 0 : value_embedded_offset (argp))); - deprecated_set_value_type (new_val, argp->type ()); + new_val->deprecated_set_type (argp->type ()); set_value_embedded_offset (new_val, (using_enc ? top + value_embedded_offset (argp) : top)); diff --git a/gdb/value.c b/gdb/value.c index 6f176b0fad9..9347acd09ce 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1024,12 +1024,6 @@ allocate_optimized_out_value (struct type *type) /* Accessor methods. */ -void -deprecated_set_value_type (struct value *value, struct type *type) -{ - value->m_type = type; -} - LONGEST value_offset (const struct value *value) { @@ -1737,8 +1731,7 @@ make_cv_value (int cnst, int voltl, struct value *v) struct type *m_enclosing_type = value_enclosing_type (v); struct value *cv_val = value_copy (v); - deprecated_set_value_type (cv_val, - make_cv_type (cnst, voltl, val_type, NULL)); + cv_val->deprecated_set_type (make_cv_type (cnst, voltl, val_type, NULL)); set_value_enclosing_type (cv_val, make_cv_type (cnst, voltl, m_enclosing_type, NULL)); @@ -3836,7 +3829,7 @@ readjust_indirect_value_type (struct value *value, struct type *enc_type, original_value_address); /* Re-adjust type. */ - deprecated_set_value_type (value, resolved_original_target_type); + value->deprecated_set_type (resolved_original_target_type); /* Add embedding info. */ set_value_enclosing_type (value, enc_type); diff --git a/gdb/value.h b/gdb/value.h index 80c92c4753e..2b626adbb29 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -164,6 +164,12 @@ struct value struct type *type () const { return m_type; } + /* This is being used to change the type of an existing value, that + code should instead be creating a new value with the changed type + (but possibly shared content). */ + void deprecated_set_type (struct type *type) + { m_type = type; } + /* Type of value; either not an lval, or one of the various different possible kinds of lval. */ @@ -346,13 +352,6 @@ struct value extern struct gdbarch *get_value_arch (const struct value *value); -/* This is being used to change the type of an existing value, that - code should instead be creating a new value with the changed type - (but possibly shared content). */ - -extern void deprecated_set_value_type (struct value *value, - struct type *type); - /* Only used for bitfields; number of bits contained in them. */ extern LONGEST value_bitsize (const struct value *);