[pypy-commit] stmgc default: Fix an assert

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r32:43d9d5cfca8b
Date: 2013-05-26 21:07 +0200
http://bitbucket.org/pypy/stmgc/changeset/43d9d5cfca8b/

Log:	Fix an assert

diff --git a/c3/nursery.c b/c3/nursery.c
--- a/c3/nursery.c
+++ b/c3/nursery.c
@@ -48,16 +48,18 @@
     if (is_in_nursery(d, obj)) {
         e = private ? K_PRIVATE : K_PROTECTED;
     }
-    else {
-        wlog_t *entry;
-        G2L_FIND(d->young_objects_outside_nursery, obj, entry,
-                 goto not_found);
-
+    else if (g2l_contains(&d->young_objects_outside_nursery, obj)) {
         if (obj->h_tid & GCFLAG_OLD)
             e = private ? K_OLD_PRIVATE : K_PUBLIC;
         else
             e = private ? K_PRIVATE : K_PROTECTED;
     }
+    else {
+        assert(stm_dbgmem_is_active(obj, 1));
+        assert(obj->h_tid & GCFLAG_OLD);
+        return private ? K_OLD_PRIVATE : K_PUBLIC;
+    }
+
     assert(stm_dbgmem_is_active(obj, 0));
     if (e == K_PRIVATE || e == K_PROTECTED)
         assert((obj->h_tid & GCFLAG_OLD) == 0);
@@ -66,13 +68,26 @@
     if (e != K_PROTECTED)
         assert(!(obj->h_tid & GCFLAG_STOLEN));
     return e;
+}
 
- not_found:
-    assert(stm_dbgmem_is_active(obj, 1));
-    assert(obj->h_tid & GCFLAG_OLD);
-    return private ? K_OLD_PRIVATE : K_PUBLIC;
+static enum protection_class_t dclassify_at_start_of_collection(gcptr obj)
+{
+    struct tx_descriptor *d = thread_descriptor;
+
+    enum protection_class_t e = dclassify(obj);
+
+    if (g2l_contains(&d->young_objects_outside_nursery, obj) &&
+            (obj->h_tid & GCFLAG_OLD)) {
+        switch (e) {
+        case K_OLD_PRIVATE: e = K_PRIVATE; break;
+        case K_PUBLIC: e = K_PROTECTED; break;
+        default: abort();
+        }
+    }
+    return e;
 }
 
+
 void stmgc_init_tls(void)
 {
     struct tx_descriptor *d = thread_descriptor;
@@ -498,7 +513,7 @@
         if (v & 2) {        /* a pointer with bit 2 set.
                                Normally set, except if R was stolen */
             L = (gcptr)(v & ~2);
-            assert(dclassify(L) == K_PROTECTED);
+            assert(dclassify_at_start_of_collection(L) == K_PROTECTED);
             visit_if_young(&L  _REASON("public.h_rev=PROTECTED"));
             /* The new value of L is the previously-protected object moved
                outside.  We can't store it immediately in R->h_revision!