Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r72935:157141a53611
Date: 2014-08-20 17:28 +0200
http://bitbucket.org/pypy/pypy/changeset/157141a53611/
Log: import stmgc/b067967930aa
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 @@
-bea13491352f
+b067967930aa
diff --git a/rpython/translator/stm/src_stm/stm/nursery.c
b/rpython/translator/stm/src_stm/stm/nursery.c
--- a/rpython/translator/stm/src_stm/stm/nursery.c
+++ b/rpython/translator/stm/src_stm/stm/nursery.c
@@ -197,7 +197,11 @@
|| write_locks[first_card_index] == 255); /* see gcpage.c */
while (card_index <= last_card_index) {
uintptr_t card_lock_idx = first_card_index + card_index;
- assert(write_locks[card_lock_idx] == CARD_CLEAR);
+ if (write_locks[card_lock_idx] != CARD_CLEAR) {
+ /* could occur if the object is immediately re-locked by
+ another thread */
+ assert(write_locks[first_card_index] != 0);
+ }
card_index++;
}
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
