Author: Remi Meier <[email protected]>
Branch: stmgc-c4
Changeset: r67536:d38e75218673
Date: 2013-10-23 22:04 +0200
http://bitbucket.org/pypy/pypy/changeset/d38e75218673/
Log: import stmgc
diff --git a/rpython/translator/stm/src_stm/revision
b/rpython/translator/stm/src_stm/revision
--- a/rpython/translator/stm/src_stm/revision
+++ b/rpython/translator/stm/src_stm/revision
@@ -1,1 +1,1 @@
-2c23968e3d8f
+d92fcb9e5246
diff --git a/rpython/translator/stm/src_stm/steal.c
b/rpython/translator/stm/src_stm/steal.c
--- a/rpython/translator/stm/src_stm/steal.c
+++ b/rpython/translator/stm/src_stm/steal.c
@@ -138,7 +138,8 @@
assert(IMPLIES(!(L->h_tid & GCFLAG_OLD), L->h_original));
assert(IMPLIES(L->h_tid & GCFLAG_OLD,
(B->h_original == (revision_t)L)
- || (B->h_original == L->h_original)));
+ || (B->h_original == L->h_original)
+ || (L->h_original == (revision_t)B)));
if (!L->h_original && L->h_tid & GCFLAG_OLD) {
/* If old, L must be the original */
B->h_original = (revision_t)L;
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
