Author: Armin Rigo <[email protected]>
Branch:
Changeset: r13:e27d375c4a29
Date: 2013-05-26 13:17 +0200
http://bitbucket.org/pypy/stmgc/changeset/e27d375c4a29/
Log: fix
diff --git a/c3/gcpage.c b/c3/gcpage.c
--- a/c3/gcpage.c
+++ b/c3/gcpage.c
@@ -701,13 +701,13 @@
case -1: fprintf(stderr, " (unmanaged)"); break;
default: fprintf(stderr, "\n CANNOT ACCESS MEMORY!\n"); abort();
}
- fprintf(stderr, "\n tid\t%16lx ", (unsigned long)obj->h_tid);
+ fprintf(stderr, "\n tid\t%16lx", (unsigned long)obj->h_tid);
count++;
pp = gc_flag_names;
for (i = STM_FIRST_GCFLAG; *pp != NULL; pp++, i <<= 1) {
if (obj->h_tid & i) {
- fprintf(stderr, " %s", *pp);
+ fprintf(stderr, " %s", *pp);
}
}
fprintf(stderr, "\n rev\t%16lx (%ld)\n",
diff --git a/c3/nursery.c b/c3/nursery.c
--- a/c3/nursery.c
+++ b/c3/nursery.c
@@ -378,7 +378,10 @@
previous_obj = NULL;
}
obj = (gcptr)obj->h_revision;
- assert(stmgc_classify(obj) != K_PRIVATE);
+ /* nb. don't use stmgc_classify() here, because some objects trigger
+ an assert at this point: young non-nursery objects which just
+ grew the flag GCFLAG_OLD */
+ assert(obj->h_revision != stm_local_revision); /* not a private object */
PATCH_ROOT_WITH(obj);
goto retry;
}
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
