diff options
author | Andy Wingo <wingo@pobox.com> | 2011-05-01 18:01:42 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-05-01 18:01:42 +0200 |
commit | ecc9d1b547b21830f5ce4f1eaceb6b9dde44e5dc (patch) | |
tree | 143e2d4f604fb794560bacedd104a50c09167010 /libguile/hashtab.c | |
parent | b735d33b2b636f457c8ca0740c99169e20b377b3 (diff) | |
download | guile-ecc9d1b547b21830f5ce4f1eaceb6b9dde44e5dc.tar.gz |
fix hash-set! in weak-value table from non-immediate to immediate
* libguile/hashtab.c (set_weak_cdr, scm_hash_fn_set_x): If we have a
weak-value hash table with a previous non-immediate value for a given
key, and we are setting an immediate as the new value, we were not
unregistering the disappearing link. Fixed.
Diffstat (limited to 'libguile/hashtab.c')
-rw-r--r-- | libguile/hashtab.c | 49 |
1 files changed, 42 insertions, 7 deletions
diff --git a/libguile/hashtab.c b/libguile/hashtab.c index 48660d75c..598b5f45f 100644 --- a/libguile/hashtab.c +++ b/libguile/hashtab.c @@ -761,21 +761,56 @@ scm_hash_fn_ref (SCM table, SCM obj, SCM dflt, +struct set_weak_cdr_data +{ + SCM pair; + SCM new_val; +}; + +static void* +set_weak_cdr (void *data) +{ + struct set_weak_cdr_data *d = data; + + if (SCM_NIMP (SCM_WEAK_PAIR_CDR (d->pair)) && !SCM_NIMP (d->new_val)) + { + GC_unregister_disappearing_link ((void *) SCM_CDRLOC (d->pair)); + SCM_SETCDR (d->pair, d->new_val); + } + else + { + SCM_SETCDR (d->pair, d->new_val); + SCM_I_REGISTER_DISAPPEARING_LINK ((void *) SCM_CDRLOC (d->pair), + SCM2PTR (d->new_val)); + } + return NULL; +} + SCM scm_hash_fn_set_x (SCM table, SCM obj, SCM val, scm_t_hash_fn hash_fn, scm_t_assoc_fn assoc_fn, void *closure) { - SCM it; + SCM pair; - it = scm_hash_fn_create_handle_x (table, obj, SCM_BOOL_F, hash_fn, assoc_fn, closure); - SCM_SETCDR (it, val); + pair = scm_hash_fn_create_handle_x (table, obj, val, + hash_fn, assoc_fn, closure); - if (SCM_HASHTABLE_WEAK_VALUE_P (table) && SCM_NIMP (val)) - /* IT is a weak-cdr pair. Register a disappearing link from IT's - cdr to VAL like `scm_weak_cdr_pair' does. */ - SCM_I_REGISTER_DISAPPEARING_LINK ((void *) SCM_CDRLOC (it), SCM2PTR (val)); + if (SCM_UNLIKELY (!scm_is_eq (SCM_CDR (pair), val))) + { + if (SCM_UNLIKELY (SCM_HASHTABLE_WEAK_VALUE_P (table))) + { + struct set_weak_cdr_data data; + data.pair = pair; + data.new_val = val; + + GC_call_with_alloc_lock (set_weak_cdr, &data); + } + else + SCM_SETCDR (pair, val); + } + return val; } |