[pypy-commit] stmgc default: Fix

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r146:7635c4202e9b
Date: 2013-06-16 12:47 +0200
http://bitbucket.org/pypy/stmgc/changeset/7635c4202e9b/

Log:	Fix

diff --git a/c4/et.c b/c4/et.c
--- a/c4/et.c
+++ b/c4/et.c
@@ -866,6 +866,9 @@
     {
       gcptr R = item->addr;
       gcptr L = item->val;
+      if (L == NULL)
+        continue;
+
       revision_t expected, v = L->h_revision;
 
       if (L->h_tid & GCFLAG_PRIVATE_FROM_PROTECTED)
diff --git a/c4/nursery.c b/c4/nursery.c
--- a/c4/nursery.c
+++ b/c4/nursery.c
@@ -186,9 +186,9 @@
                be able to commit successfully.
             */
             fprintf(stderr, "public_to_young: %p was modified! abort!\n", P);
-            abort();
+            item->val = NULL;
             AbortTransactionAfterCollect(d, ABRT_COLLECT_MINOR);
-            //...
+            continue;
         }
 
         fprintf(stderr, "public_to_young: %p -> %p in public_to_private\n",