Author: Armin Rigo <[email protected]>
Branch: remove-globals-in-jit
Changeset: r58930:ae1f7e5a2765
Date: 2012-11-15 17:32 +0100
http://bitbucket.org/pypy/pypy/changeset/ae1f7e5a2765/
Log: Fix force().
diff --git a/pypy/jit/backend/x86/runner.py b/pypy/jit/backend/x86/runner.py
--- a/pypy/jit/backend/x86/runner.py
+++ b/pypy/jit/backend/x86/runner.py
@@ -138,14 +138,14 @@
frb = self.assembler._find_failure_recovery_bytecode(faildescr)
bytecode = rffi.cast(rffi.UCHARP, frb)
# start of "no gc operation!" block
- fail_index_2 = self.assembler.grab_frame_values(
+ deadframe = self.assembler.grab_frame_values(
+ self,
bytecode,
addr_of_force_token,
self.all_null_registers)
- self.assembler.leave_jitted_hook()
# end of "no gc operation!" block
- assert fail_index == fail_index_2
- return faildescr
+ assert self.get_latest_descr(deadframe) is faildescr
+ return deadframe
def redirect_call_assembler(self, oldlooptoken, newlooptoken):
self.assembler.redirect_call_assembler(oldlooptoken, newlooptoken)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
