[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.1-105-g2187975

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=2187975e391efd3e4b8078f2ce477d62856edc20

The branch, stable-2.0 has been updated
       via  2187975e391efd3e4b8078f2ce477d62856edc20 (commit)
      from  dfb572a7bf37d70e46d91d62955fe3e404fdcc58 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2187975e391efd3e4b8078f2ce477d62856edc20
Author: Andy Wingo <address@hidden>
Date:   Mon May 30 11:33:10 2011 +0200

    fix subtle and bad scm_internal_hash_fold bug for weak tables
    
    * libguile/hashtab.c (scm_internal_hash_fold): Don't try to unlink
      deleted weak pairs.  Our previous code was buggy (`prev' should have
      only been updated in the case of a successful traversal), but more
      than that, we're not in the alloc lock.
    
      Thanks very much to Michael Wells for the report, and the debugging!

-----------------------------------------------------------------------

Summary of changes:
 libguile/hashtab.c |   42 +++++++++++-------------------------------
 1 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index d707993..440738c 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -1377,40 +1377,20 @@ scm_internal_hash_fold (scm_t_hash_fold_fn fn, void 
*closure,
   n = SCM_SIMPLE_VECTOR_LENGTH (buckets);
   for (i = 0; i < n; ++i)
     {
-      SCM prev, ls;
+      SCM ls, handle;
 
-      for (prev = SCM_BOOL_F, ls = SCM_SIMPLE_VECTOR_REF (buckets, i);
-          !scm_is_null (ls);
-          prev = ls, ls = SCM_CDR (ls))
+      for (ls = SCM_SIMPLE_VECTOR_REF (buckets, i); !scm_is_null (ls);
+          ls = SCM_CDR (ls))
        {
-         SCM handle;
-
-         if (!scm_is_pair (ls))
-           SCM_WRONG_TYPE_ARG (SCM_ARG3, buckets);
-
          handle = SCM_CAR (ls);
-         if (!scm_is_pair (handle))
-           SCM_WRONG_TYPE_ARG (SCM_ARG3, buckets);
 
-         if (SCM_HASHTABLE_WEAK_P (table))
-           {
-             if (SCM_WEAK_PAIR_DELETED_P (handle))
-               {
-                 /* We hit a weak pair whose car/cdr has become
-                    unreachable: unlink it from the bucket.  */
-                 if (scm_is_true (prev))
-                   SCM_SETCDR (prev, SCM_CDR (ls));
-                 else
-                   SCM_SIMPLE_VECTOR_SET (buckets, i, SCM_CDR (ls));
-
-                  /* Update the item count.  */
-                  SCM_HASHTABLE_DECREMENT (table);
-
-                 continue;
-               }
-           }
-
-         result = fn (closure, SCM_CAR (handle), SCM_CDR (handle), result);
+         if (SCM_HASHTABLE_WEAK_P (table) && SCM_WEAK_PAIR_DELETED_P (handle))
+            /* Don't try to unlink this weak pair, as we're not within
+               the allocation lock.  Instead rely on
+               vacuum_weak_hash_table to do its job.  */
+            continue;
+          else
+            result = fn (closure, SCM_CAR (handle), SCM_CDR (handle), result);
        }
     }
 


hooks/post-receive
-- 
GNU Guile