Author: Tobias Weber <tobias_webe...@gmx.de>
Branch: c8-adaptive-trx-length-per-thread
Changeset: r2126:ff769635407d
Date: 2017-07-13 22:37 +0200
http://bitbucket.org/pypy/stmgc/changeset/ff769635407d/
Log: Merge fix for syntax error
diff --git a/c8/stm/nursery.c b/c8/stm/nursery.c
--- a/c8/stm/nursery.c
+++ b/c8/stm/nursery.c
@@ -542,7 +542,7 @@
pseg->pub.nursery_current = (stm_char *)_stm_nursery_start;
pseg->pub.nursery_mark -= nursery_used;
- assert((pseg->transaction_state == TS_INEVITABLE) ||
!pseg->commit_if_not_atomic)
+ assert((pseg->transaction_state == TS_INEVITABLE) ||
!pseg->commit_if_not_atomic);
if (pseg->commit_if_not_atomic
&& pseg->transaction_state == TS_INEVITABLE
&& pseg->pub.running_thread->self_or_0_if_atomic != 0) {
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
