Remove make_cleanup_value_free

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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 511df166630ca8c33709b5a4707ba05a621ba75a..34a61078e81e8acec4a626f8374a21560ca0fa4b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2017-10-08  Tom Tromey  <tom@tromey.com>
 
        * symtab.c (free_search_symbols, do_free_search_symbols_cleanup)

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index c485eaf8b02fddac0ec01b59f5e88544b7873f2c..fe2fea0d0e6a0e2b3c9656ba6e31dec17fe820f1 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -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;
 

diff --git a/gdb/utils.c b/gdb/utils.c
index 118fcc3e6d048afab58dba0d3162bd70608a6dce..07841afb8f19ffad3e2a8e86bf85e45e80d0abab 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -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
 

diff --git a/gdb/utils.h b/gdb/utils.h
index 022af5116c5e152e9a37f079d944add24d9babda..7af0a5f5aef2321ec2910e62a8a89718a4b8fa7e 100644 (file)
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -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

diff --git a/gdb/value.h b/gdb/value.h
index 6dee80af339b1abd1e7a65fe35172d64ec41f892..bc97ec0728f34aa969320a13f7def0d28894f748 100644 (file)
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -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);