Author: Remi Meier <[email protected]>
Branch: stmgc-c4
Changeset: r66394:5fb41d870c59
Date: 2013-08-28 15:11 +0200
http://bitbucket.org/pypy/pypy/changeset/5fb41d870c59/
Log: import stmgc
diff --git a/rpython/translator/stm/src_stm/et.c
b/rpython/translator/stm/src_stm/et.c
--- a/rpython/translator/stm/src_stm/et.c
+++ b/rpython/translator/stm/src_stm/et.c
@@ -589,6 +589,7 @@
assert(!(L->h_tid & GCFLAG_STUB));
assert(!(L->h_tid & GCFLAG_PRIVATE_FROM_PROTECTED));
L->h_tid &= ~(GCFLAG_VISITED |
+ GCFLAG_MARKED |
GCFLAG_PUBLIC |
GCFLAG_PREBUILT_ORIGINAL |
GCFLAG_PUBLIC_TO_PRIVATE |
diff --git a/rpython/translator/stm/src_stm/extra.c
b/rpython/translator/stm/src_stm/extra.c
--- a/rpython/translator/stm/src_stm/extra.c
+++ b/rpython/translator/stm/src_stm/extra.c
@@ -58,6 +58,8 @@
stub->h_original = (revision_t)obj;
}
+ STUB_THREAD(stub) = d->public_descriptor;
+
result = (intptr_t)stub;
spinlock_release(d->public_descriptor->collection_lock);
stm_register_integer_address(result);
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 @@
-cdd017855adc+
+aa8b51f1033d+
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
