Author: Armin Rigo <[email protected]>
Branch: stmgc-c4
Changeset: r67116:82cd81e41cfb
Date: 2013-09-27 23:37 +0200
http://bitbucket.org/pypy/pypy/changeset/82cd81e41cfb/
Log: update to stmgc/d78107007cab
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
@@ -1018,7 +1018,10 @@
// jump back to the setjmp_buf (this call does not return)
stm_stop_sharedlock();
if (d->longjmp_callback != NULL)
- d->longjmp_callback(d->setjmp_buf);
+ {
+ stm_begin_transaction(d->setjmp_buf, d->longjmp_callback);
+ d->longjmp_callback(d->setjmp_buf);
+ }
else
longjmp(*(jmp_buf *)d->setjmp_buf, 1);
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 @@
-ad70e2445849
+d78107007cab
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
