mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 04:10:18 +02:00
Code Activity

fix hash-set! in weak-value table from non-immediate to immediate

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2011-05-01 18:01:42 +02:00
parent b735d33b2b
commit ecc9d1b547
1 changed files with 42 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

49
libguile/hashtab.c
View file

@ -761,20 +761,55 @@ 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
scm_hash_fn_set_x (SCM table, SCM obj, SCM val, scm_hash_fn_set_x (SCM table, SCM obj, SCM val,
scm_t_hash_fn hash_fn, scm_t_assoc_fn assoc_fn, scm_t_hash_fn hash_fn, scm_t_assoc_fn assoc_fn,
void *closure) void *closure)
{ {
SCM it; SCM pair;
it = scm_hash_fn_create_handle_x (table, obj, SCM_BOOL_F, hash_fn, assoc_fn, closure); pair = scm_hash_fn_create_handle_x (table, obj, val,
SCM_SETCDR (it, val); hash_fn, assoc_fn, closure);
if (SCM_HASHTABLE_WEAK_VALUE_P (table) && SCM_NIMP (val)) if (SCM_UNLIKELY (!scm_is_eq (SCM_CDR (pair), val)))
/* IT is a weak-cdr pair. Register a disappearing link from IT's {
cdr to VAL like `scm_weak_cdr_pair' does. */ if (SCM_UNLIKELY (SCM_HASHTABLE_WEAK_VALUE_P (table)))
SCM_I_REGISTER_DISAPPEARING_LINK ((void *) SCM_CDRLOC (it), SCM2PTR (val)); {
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; return val;
} }