Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r73769:b6a8998e5276
Date: 2014-10-04 18:18 +0200
http://bitbucket.org/pypy/pypy/changeset/b6a8998e5276/
Log: import stmgc/57b388129192
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 @@
-8f88cdb1d916
+57b388129192
diff --git a/rpython/translator/stm/src_stm/stm/core.c
b/rpython/translator/stm/src_stm/stm/core.c
--- a/rpython/translator/stm/src_stm/stm/core.c
+++ b/rpython/translator/stm/src_stm/stm/core.c
@@ -399,8 +399,13 @@
{
/* used to be more efficient, starting directly an inevitable transaction,
but there is no real point any more, I believe */
+ rewind_jmp_buf rjbuf;
+ stm_rewind_jmp_enterframe(tl, &rjbuf);
+
stm_start_transaction(tl);
stm_become_inevitable(tl, "start_inevitable_transaction");
+
+ stm_rewind_jmp_leaveframe(tl, &rjbuf);
}
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
