[RFA] Remove make_cleanup_value_free
Commit Message
This removes make_cleanup_value_free, in favor of a unique_ptr
specialization.
Regression tested by the buildbot.
gdb/ChangeLog
2017-10-08 Tom Tromey <tom@tromey.com>
* utils.h (make_cleanup_value_free): Remove.
* utils.c (do_value_free, struct cleanup): Remove.
* dwarf2loc.c (dwarf2_evaluate_loc_desc_full) <DWARF_VALUE_STACK>:
Use gdb_value_up.
* value.h (struct value_deleter): New.
(gdb_value_up): New typedef.
---
gdb/ChangeLog | 9 +++++++++
gdb/dwarf2loc.c | 5 +----
gdb/utils.c | 16 ----------------
gdb/utils.h | 1 -
gdb/value.h | 15 +++++++++++++++
5 files changed, 25 insertions(+), 21 deletions(-)
Comments
On 2017-10-08 06:52 PM, Tom Tromey wrote:
> This removes make_cleanup_value_free, in favor of a unique_ptr
> specialization.
>
> Regression tested by the buildbot.
LGTM.
@@ -2478,7 +2478,6 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
size_t len = TYPE_LENGTH (subobj_type);
size_t max = TYPE_LENGTH (type);
struct gdbarch *objfile_gdbarch = get_objfile_arch (objfile);
- struct cleanup *cleanup;
if (subobj_byte_offset + len > max)
invalid_synthetic_pointer ();
@@ -2488,7 +2487,7 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
below. */
value_incref (value);
free_values.free_to_mark ();
- cleanup = make_cleanup_value_free (value);
+ gdb_value_up value_holder (value);
retval = allocate_value (subobj_type);
@@ -2498,8 +2497,6 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
memcpy (value_contents_raw (retval),
value_contents_all (value) + subobj_byte_offset, len);
-
- do_cleanups (cleanup);
}
break;
@@ -185,22 +185,6 @@ make_cleanup_value_free_to_mark (struct value *mark)
return make_cleanup (do_value_free_to_mark, mark);
}
-/* Helper for make_cleanup_value_free. */
-
-static void
-do_value_free (void *value)
-{
- value_free ((struct value *) value);
-}
-
-/* Free VALUE. */
-
-struct cleanup *
-make_cleanup_value_free (struct value *value)
-{
- return make_cleanup (do_value_free, value);
-}
-
/* This function is useful for cleanups.
Do
@@ -215,7 +215,6 @@ struct target_ops;
extern struct cleanup *make_cleanup_unpush_target (struct target_ops *ops);
extern struct cleanup *make_cleanup_value_free_to_mark (struct value *);
-extern struct cleanup *make_cleanup_value_free (struct value *);
/* A deleter for a hash table. */
struct htab_deleter
@@ -1018,6 +1018,21 @@ extern void value_incref (struct value *val);
extern void value_free (struct value *val);
+/* A free policy class to interface std::unique_ptr with
+ value_free. */
+
+struct value_deleter
+{
+ void operator() (struct value *value) const
+ {
+ value_free (value);
+ }
+};
+
+/* A unique pointer to a struct value. */
+
+typedef std::unique_ptr<struct value, value_deleter> gdb_value_up;
+
extern void free_all_values (void);
extern void free_value_chain (struct value *v);