espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-10-19 05:42:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove make_cleanup_value_free

Browse Source 
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.
This commit is contained in:
Tom Tromey
2017-10-08 12:20:49 -06:00
parent b9c04fb268
commit 757325a3f2
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -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> 2017-10-08 Tom Tromey <tom@tromey.com>
* symtab.c (free_search_symbols, do_free_search_symbols_cleanup) * symtab.c (free_search_symbols, do_free_search_symbols_cleanup)

5
gdb/dwarf2loc.c
View File

@ -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 len = TYPE_LENGTH (subobj_type);
size_t max = TYPE_LENGTH (type); size_t max = TYPE_LENGTH (type);
struct gdbarch *objfile_gdbarch = get_objfile_arch (objfile); struct gdbarch *objfile_gdbarch = get_objfile_arch (objfile);
struct cleanup *cleanup;
if (subobj_byte_offset + len > max) if (subobj_byte_offset + len > max)
invalid_synthetic_pointer (); invalid_synthetic_pointer ();
@ -2488,7 +2487,7 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
below. */ below. */
value_incref (value); value_incref (value);
free_values.free_to_mark (); free_values.free_to_mark ();
cleanup = make_cleanup_value_free (value); gdb_value_up value_holder (value);
retval = allocate_value (subobj_type); 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), memcpy (value_contents_raw (retval),
value_contents_all (value) + subobj_byte_offset, len); value_contents_all (value) + subobj_byte_offset, len);
do_cleanups (cleanup);
} }
break; break;

16
gdb/utils.c
View File

@ -185,22 +185,6 @@ make_cleanup_value_free_to_mark (struct value *mark)
return make_cleanup (do_value_free_to_mark, 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. /* This function is useful for cleanups.
Do Do

1
gdb/utils.h
View File

@ -215,7 +215,6 @@ struct target_ops;
extern struct cleanup *make_cleanup_unpush_target (struct target_ops *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_to_mark (struct value *);
extern struct cleanup *make_cleanup_value_free (struct value *);
/* A deleter for a hash table. */ /* A deleter for a hash table. */
struct htab_deleter struct htab_deleter

15
gdb/value.h
View File

@ -1018,6 +1018,21 @@ extern void value_incref (struct value *val);
extern void value_free (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_all_values (void);
extern void free_value_chain (struct value *v); extern void free_value_chain (struct value *v);