Author: Armin Rigo <[email protected]>
Branch: stmgc-c4
Changeset: r66857:533cd1f88e46
Date: 2013-09-09 09:46 +0200
http://bitbucket.org/pypy/pypy/changeset/533cd1f88e46/
Log: import stmgc/698910c9edc3
diff --git a/rpython/translator/stm/src_stm/gcpage.c
b/rpython/translator/stm/src_stm/gcpage.c
--- a/rpython/translator/stm/src_stm/gcpage.c
+++ b/rpython/translator/stm/src_stm/gcpage.c
@@ -504,7 +504,9 @@
G2L_LOOP_FORWARD(registered_stubs, item) {
gcptr R = item->addr;
assert(R->h_tid & GCFLAG_SMALLSTUB);
- assert(!(R->h_tid & (GCFLAG_VISITED | GCFLAG_MARKED)));
+ /* The following assert can fail if we have a stub pointing to
+ a stub and both are registered_stubs. This case is benign. */
+ //assert(!(R->h_tid & (GCFLAG_VISITED | GCFLAG_MARKED)));
R->h_tid |= (GCFLAG_MARKED | GCFLAG_VISITED);
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 @@
-782ebd6afc03
+698910c9edc3
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
