[pypy-commit] stmgc default: fix some debug assert

Raemi noreply at buildbot.pypy.org
Mon Nov 18 11:20:01 CET 2013


Author: Remi Meier <remi.meier at gmail.com>
Branch: 
Changeset: r547:3d0358c80701
Date: 2013-11-08 15:28 +0100
http://bitbucket.org/pypy/stmgc/changeset/3d0358c80701/

Log:	fix some debug assert

diff --git a/c4/nursery.c b/c4/nursery.c
--- a/c4/nursery.c
+++ b/c4/nursery.c
@@ -84,7 +84,7 @@
     }
 #ifdef _GC_DEBUG
     if (P != NULL) {
-        assert(P->h_tid != 0);
+        assert((P->h_tid & STM_USER_TID_MASK) == (tid & STM_USER_TID_MASK));
         assert_cleared(((char *)P) + sizeof(revision_t),
                        size - sizeof(revision_t));
     }
diff --git a/c4/stmgc.h b/c4/stmgc.h
--- a/c4/stmgc.h
+++ b/c4/stmgc.h
@@ -38,7 +38,7 @@
 
 /* allocates a public reference to the object that will 
    not be freed until stm_unregister_integer_address is 
-   called on the result */
+   called on the result (push roots!) */
 intptr_t stm_allocate_public_integer_address(gcptr);
 void stm_unregister_integer_address(intptr_t);
 


More information about the pypy-commit mailing list