From b27556e3c10e197cc31021649a6113bb305b970e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 31 Jan 2023 13:30:54 -0700 Subject: Turn allocate_optimized_out_value into static "constructor" This turns allocate_optimized_out_value into a static "constructor" of value. Approved-By: Simon Marchi --- gdb/ada-lang.c | 2 +- gdb/dwarf2/expr.c | 2 +- gdb/dwarf2/loc.c | 10 +++++----- gdb/eval.c | 2 +- gdb/findvar.c | 2 +- gdb/frame-unwind.c | 2 +- gdb/python/py-type.c | 2 +- gdb/s390-tdep.c | 2 +- gdb/stack.c | 2 +- gdb/value.c | 10 +++++----- gdb/value.h | 5 +++-- 11 files changed, 21 insertions(+), 20 deletions(-) (limited to 'gdb') diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 3d2c9f4..727f816 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -556,7 +556,7 @@ coerce_unspec_val_to_type (struct value *val, struct type *type) struct value *result; if (value_optimized_out (val)) - result = allocate_optimized_out_value (type); + result = value::allocate_optimized_out (type); else if (val->lazy () /* Be careful not to make a lazy not_lval value. */ || (VALUE_LVAL (val) != not_lval diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index ad6cf56..db88dc3 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -1044,7 +1044,7 @@ dwarf_expr_context::fetch_result (struct type *type, struct type *subobj_type, break; case DWARF_VALUE_OPTIMIZED_OUT: - retval = allocate_optimized_out_value (subobj_type); + retval = value::allocate_optimized_out (subobj_type); break; /* DWARF_VALUE_IMPLICIT_POINTER was converted to a pieced diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index 743a0ce..96686d9 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -1429,7 +1429,7 @@ fetch_const_value_from_synthetic_pointer (sect_offset die, LONGEST byte_offset, invalid_synthetic_pointer (); } else - result = allocate_optimized_out_value (type->target_type ()); + result = value::allocate_optimized_out (type->target_type ()); return result; } @@ -1497,7 +1497,7 @@ dwarf2_evaluate_loc_desc_full (struct type *type, frame_info_ptr frame, invalid_synthetic_pointer (); if (size == 0) - return allocate_optimized_out_value (subobj_type); + return value::allocate_optimized_out (subobj_type); dwarf_expr_context ctx (per_objfile, per_cu->addr_size ()); @@ -1524,7 +1524,7 @@ dwarf2_evaluate_loc_desc_full (struct type *type, frame_info_ptr frame, if (entry_values_debug) exception_print (gdb_stdout, ex); free_values.free_to_mark (); - return allocate_optimized_out_value (subobj_type); + return value::allocate_optimized_out (subobj_type); } else throw; @@ -3906,11 +3906,11 @@ loclist_read_variable_at_entry (struct symbol *symbol, frame_info_ptr frame) CORE_ADDR pc; if (frame == NULL || !get_frame_func_if_available (frame, &pc)) - return allocate_optimized_out_value (symbol->type ()); + return value::allocate_optimized_out (symbol->type ()); data = dwarf2_find_location_expression (dlbaton, &size, pc); if (data == NULL) - return allocate_optimized_out_value (symbol->type ()); + return value::allocate_optimized_out (symbol->type ()); return value_of_dwarf_block_entry (symbol->type (), frame, data, size); } diff --git a/gdb/eval.c b/gdb/eval.c index 5f8d294..bb72043 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2855,7 +2855,7 @@ var_value_operation::evaluate_for_sizeof (struct expression *exp, return value_zero (size_type, not_lval); else if (is_dynamic_type (type->index_type ()) && type->bounds ()->high.kind () == PROP_UNDEFINED) - return allocate_optimized_out_value (size_type); + return value::allocate_optimized_out (size_type); } } return evaluate_subexp_for_sizeof_base (exp, type); diff --git a/gdb/findvar.c b/gdb/findvar.c index b59962c..048e439 100644 --- a/gdb/findvar.c +++ b/gdb/findvar.c @@ -769,7 +769,7 @@ language_defn::read_var_value (struct symbol *var, case LOC_OPTIMIZED_OUT: if (is_dynamic_type (type)) type = resolve_dynamic_type (type, {}, /* Unused address. */ 0); - return allocate_optimized_out_value (type); + return value::allocate_optimized_out (type); default: error (_("Cannot look up value of a botched symbol `%s'."), diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c index d3baedb..ab6c33f 100644 --- a/gdb/frame-unwind.c +++ b/gdb/frame-unwind.c @@ -267,7 +267,7 @@ frame_unwind_got_optimized (frame_info_ptr frame, int regnum) struct gdbarch *gdbarch = frame_unwind_arch (frame); struct type *type = register_type (gdbarch, regnum); - return allocate_optimized_out_value (type); + return value::allocate_optimized_out (type); } /* Return a value which indicates that FRAME copied REGNUM into diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c index 81b5951..0a37878 100644 --- a/gdb/python/py-type.c +++ b/gdb/python/py-type.c @@ -1189,7 +1189,7 @@ typy_optimized_out (PyObject *self, PyObject *args) { struct type *type = ((type_object *) self)->type; - return value_to_value_object (allocate_optimized_out_value (type)); + return value_to_value_object (value::allocate_optimized_out (type)); } /* Return a gdb.Field object for the field named by the argument. */ diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 9aa2c06..822f66d 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -2239,7 +2239,7 @@ s390_unwind_pseudo_register (frame_info_ptr this_frame, int regnum) return value_cast (type, val); } - return allocate_optimized_out_value (type); + return value::allocate_optimized_out (type); } /* Translate a .eh_frame register to DWARF register, or adjust a diff --git a/gdb/stack.c b/gdb/stack.c index 9952c3a..ca6087f 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -674,7 +674,7 @@ read_frame_arg (const frame_print_options &fp_opts, || (fp_opts.print_entry_values == print_entry_values_preferred && (!val || value_optimized_out (val)))) { - entryval = allocate_optimized_out_value (sym->type ()); + entryval = value::allocate_optimized_out (sym->type ()); entryval_error = NULL; } } diff --git a/gdb/value.c b/gdb/value.c index 7fb12d8..a957372 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1008,10 +1008,10 @@ value::allocate_computed (struct type *type, return v; } -/* Allocate NOT_LVAL value for type TYPE being OPTIMIZED_OUT. */ +/* See value.h. */ struct value * -allocate_optimized_out_value (struct type *type) +value::allocate_optimized_out (struct type *type) { struct value *retval = value::allocate_lazy (type); @@ -2875,7 +2875,7 @@ value_static_field (struct type *type, int fieldno) struct type *field_type = type->field (fieldno).type (); if (!msym.minsym) - retval = allocate_optimized_out_value (field_type); + retval = value::allocate_optimized_out (field_type); else retval = value_at_lazy (field_type, msym.value_address ()); } @@ -3224,7 +3224,7 @@ unpack_value_bitfield (struct value *dest_val, valid. Optimized out/unavailable bits are read as zero, but that's OK, as they'll end up marked below. If the VAL is wholly-invalid we may have skipped allocating its contents, - though. See allocate_optimized_out_value. */ + though. See value::allocate_optimized_out. */ if (valaddr != NULL) { LONGEST num; @@ -4196,7 +4196,7 @@ test_value_copy () /* Verify that we can copy an entirely optimized out value, that may not have its contents allocated. */ - value_ref_ptr val = release_value (allocate_optimized_out_value (type)); + value_ref_ptr val = release_value (value::allocate_optimized_out (type)); value_ref_ptr copy = release_value (value_copy (val.get ())); SELF_CHECK (value_entirely_optimized_out (val.get ())); diff --git a/gdb/value.h b/gdb/value.h index dbbb619..4d5ef01 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -175,6 +175,9 @@ public: const struct lval_funcs *funcs, void *closure); + /* Allocate NOT_LVAL value for type TYPE being OPTIMIZED_OUT. */ + static struct value *allocate_optimized_out (struct type *type); + ~value (); DISABLE_COPY_AND_ASSIGN (value); @@ -625,8 +628,6 @@ struct lval_funcs void (*free_closure) (struct value *v); }; -extern struct value *allocate_optimized_out_value (struct type *type); - /* Throw an error complaining that the value has been optimized out. */ -- cgit v1.1