[pypy-commit] pypy ec-threadlocal: test fix in jit/metainterp/test/test_threadlocal

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: ec-threadlocal
Changeset: r72163:0181317b2980
Date: 2014-06-23 18:46 +0200
http://bitbucket.org/pypy/pypy/changeset/0181317b2980/

Log:	test fix in jit/metainterp/test/test_threadlocal

diff --git a/rpython/rlib/rthread.py b/rpython/rlib/rthread.py
--- a/rpython/rlib/rthread.py
+++ b/rpython/rlib/rthread.py
@@ -314,9 +314,11 @@
             if we_are_translated():
                 from rpython.rtyper.annlowlevel import cast_instance_to_base_ptr
                 from rpython.rlib.rgc import _make_sure_does_not_move
+                from rpython.rlib.objectmodel import running_on_llinterp
                 ptr = cast_instance_to_base_ptr(value)
-                gcref = lltype.cast_opaque_ptr(llmemory.GCREF, ptr)
-                _make_sure_does_not_move(gcref)
+                if not running_on_llinterp:
+                    gcref = lltype.cast_opaque_ptr(llmemory.GCREF, ptr)
+                    _make_sure_does_not_move(gcref)
                 llop.threadlocalref_set(lltype.Void, opaque_id, ptr)
             else:
                 self.local.value = value