[pypy-commit] pypy stmgc-c7: update to stmgc/889897f2f5ef (branch "marker")

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r70800:7f2b59d09a77
Date: 2014-04-20 13:39 +0200
http://bitbucket.org/pypy/pypy/changeset/7f2b59d09a77/

Log:	update to stmgc/889897f2f5ef (branch "marker")

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 @@
-a4c30401045f
+889897f2f5ef
diff --git a/rpython/translator/stm/src_stm/stm/marker.c b/rpython/translator/stm/src_stm/stm/marker.c
--- a/rpython/translator/stm/src_stm/stm/marker.c
+++ b/rpython/translator/stm/src_stm/stm/marker.c
@@ -21,7 +21,9 @@
         stm_thread_local_t *tl = pseg->pub.running_thread;
         struct stm_shadowentry_s *current = tl->shadowstack - 1;
         struct stm_shadowentry_s *base = tl->shadowstack_base;
-        while (--current >= base) {
+        /* stop walking just before shadowstack_base, which contains
+           STM_STACK_MARKER_OLD which shouldn't be expanded */
+        while (--current > base) {
             uintptr_t x = (uintptr_t)current->ss;
             if (x & 1) {
                 /* the stack entry is an odd number */