Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r70265:529c84afe33c
Date: 2014-03-24 21:46 +0100
http://bitbucket.org/pypy/pypy/changeset/529c84afe33c/
Log: import stmgc/510720112e4c
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 @@
-ee65d7dc215e
+510720112e4c
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
@@ -590,6 +590,7 @@
/* reset the tl->shadowstack and thread_local_obj to their original
value before the transaction start */
stm_thread_local_t *tl = pseg->pub.running_thread;
+ assert(tl->shadowstack >= pseg->shadowstack_at_start_of_transaction);
tl->shadowstack = pseg->shadowstack_at_start_of_transaction;
tl->thread_local_obj = pseg->threadlocal_at_start_of_transaction;
tl->last_abort__bytes_in_nursery = bytes_in_nursery;
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
