[pypy-commit] pypy stmgc-c8: fix

arigo noreply at buildbot.pypy.org
Sun Mar 8 20:03:48 CET 2015


Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c8
Changeset: r76285:89d3462f6005
Date: 2015-03-08 20:03 +0100
http://bitbucket.org/pypy/pypy/changeset/89d3462f6005/

Log:	fix

diff --git a/rpython/translator/stm/src_stm/extracode.h b/rpython/translator/stm/src_stm/extracode.h
--- a/rpython/translator/stm/src_stm/extracode.h
+++ b/rpython/translator/stm/src_stm/extracode.h
@@ -157,8 +157,7 @@
 {
     /* only for tests: XXX fishing */
     stm_loc_marker_t marker;
-    marker.tl = &stm_thread_local;
-    marker.segment_base = STM_SEGMENT->segment_base;
+    char *segment_base = STM_SEGMENT->segment_base;
 
     struct stm_shadowentry_s *_ss = stm_thread_local.shadowstack - 2;
     while (!(((uintptr_t)(_ss->ss)) & 1)) {
@@ -169,7 +168,8 @@
     marker.object = (_ss + 1)->ss;
 
     static char buffer[80];
-    int length = _stm_expand_marker_for_pypy(&marker, buffer, 80);
+    int length;
+    length = _stm_expand_marker_for_pypy(segment_base, &marker,buffer, 80);
     assert(length >= 0 && length < 80);
     buffer[length] = 0;
     return buffer;


More information about the pypy-commit mailing list