aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/splay-tree.c13
2 files changed, 16 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 496d76d..c9ff317 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-11 Philippe Waroquiers <philippe.waroquiers@skynet.be>
+
+ * splay-tree.c (splay_tree_insert): Also release old KEY in case
+ of insertion of a key equal to an already present key.
+ (splay_tree_new_typed_alloc): Update comment.
+
2019-01-21 Tom Tromey <tom@tromey.com>
* splay-tree.c (splay_tree_remove): Delete the key if necessary.
diff --git a/libiberty/splay-tree.c b/libiberty/splay-tree.c
index 21d23c3..4bbb39a 100644
--- a/libiberty/splay-tree.c
+++ b/libiberty/splay-tree.c
@@ -318,7 +318,11 @@ different types need to be allocated with different allocators.
The splay tree will use @var{compare_fn} to compare nodes,
@var{delete_key_fn} to deallocate keys, and @var{delete_value_fn} to
-deallocate values.
+deallocate values. Keys and values will be deallocated when the
+tree is deleted using splay_tree_delete or when a node is removed
+using splay_tree_remove. splay_tree_insert will release the previously
+inserted key and value using @var{delete_key_fn} and @var{delete_value_fn}
+if the inserted key is already found in the tree.
@end deftypefn
@@ -372,10 +376,13 @@ splay_tree_insert (splay_tree sp, splay_tree_key key, splay_tree_value value)
if (sp->root && comparison == 0)
{
- /* If the root of the tree already has the indicated KEY, just
- replace the value with VALUE. */
+ /* If the root of the tree already has the indicated KEY, delete
+ the old key and old value, and replace them with KEY and VALUE. */
+ if (sp->delete_key)
+ (*sp->delete_key) (sp->root->key);
if (sp->delete_value)
(*sp->delete_value)(sp->root->value);
+ sp->root->key = key;
sp->root->value = value;
}
else