[pypy-commit] pypy stmgc-c7-rewindjmp: Fix

arigo noreply at buildbot.pypy.org
Mon Aug 18 16:55:25 CEST 2014


Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7-rewindjmp
Changeset: r72890:eb63f04c42a5
Date: 2014-08-18 16:54 +0200
http://bitbucket.org/pypy/pypy/changeset/eb63f04c42a5/

Log:	Fix

diff --git a/rpython/jit/backend/x86/callbuilder.py b/rpython/jit/backend/x86/callbuilder.py
--- a/rpython/jit/backend/x86/callbuilder.py
+++ b/rpython/jit/backend/x86/callbuilder.py
@@ -491,6 +491,7 @@
             self.mc.MOV_rs(eax.value, 0)
 
     def call_stm_before_ex_call(self):
+        from rpython.rlib import rstm
         # XXX slowish: before any CALL_RELEASE_GIL, invoke the
         # pypy_stm_commit_if_not_atomic() function.  Messy because
         # we need to save the register arguments first.
@@ -519,6 +520,7 @@
             self.mc.POP_r(self.ARGUMENTS_GPR[i].value)
 
     def call_stm_after_ex_call(self):
+        from rpython.rlib import rstm
         # after any CALL_RELEASE_GIL, invoke the
         # pypy_stm_start_if_not_atomic() function
         self.save_result_value_reacq()


More information about the pypy-commit mailing list