Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r76502:19a70527aa8a
Date: 2015-03-22 08:38 +0100
http://bitbucket.org/pypy/pypy/changeset/19a70527aa8a/
Log: import stmgc/a0b5046a7bea
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 @@
-5da5ba86b2fa
+a0b5046a7bea
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
@@ -351,7 +351,9 @@
STM_PSEGMENT->shadowstack_at_start_of_transaction = tl->shadowstack;
STM_PSEGMENT->threadlocal_at_start_of_transaction = tl->thread_local_obj;
- uint8_t rv = STM_SEGMENT->transaction_read_version + 1;
+ uint8_t rv = STM_SEGMENT->transaction_read_version;
+ if (rv < 0xff) /* else, rare (maybe impossible?) case: we did already */
+ rv++; /* incr it but enter_safe_point_if_requested() aborted */
STM_SEGMENT->transaction_read_version = rv;
enter_safe_point_if_requested();
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
