Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r57693:166c5a450114
Date: 2012-10-01 09:31 +0200
http://bitbucket.org/pypy/pypy/changeset/166c5a450114/
Log: issue1274 testing
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -223,7 +223,7 @@
return next_instr
if opcode == self.opcodedesc.JUMP_ABSOLUTE.index:
- return self.jump_absolute(oparg, next_instr, ec)
+ return self.jump_absolute(oparg, ec)
if we_are_translated():
for opdesc in unrolling_all_opcode_descs:
@@ -858,7 +858,8 @@
def YIELD_VALUE(self, oparg, next_instr):
raise Yield
- def jump_absolute(self, jumpto, next_instr, ec):
+ def jump_absolute(self, jumpto, ec):
+ # this function is overridden by pypy.module.pypyjit.interp_jit
check_nonneg(jumpto)
return jumpto
@@ -1268,7 +1269,9 @@
# and jump to the beginning of the loop, stored in the
# exception's argument
frame.append_block(self)
- return r_uint(unroller.jump_to)
+ jumpto = unroller.jump_to
+ ec = frame.space.getexecutioncontext()
+ return r_uint(frame.jump_absolute(jumpto, ec))
else:
# jump to the end of the loop
self.cleanupstack(frame)
diff --git a/pypy/module/pypyjit/interp_jit.py
b/pypy/module/pypyjit/interp_jit.py
--- a/pypy/module/pypyjit/interp_jit.py
+++ b/pypy/module/pypyjit/interp_jit.py
@@ -79,7 +79,7 @@
except ExitFrame:
return self.popvalue()
- def jump_absolute(self, jumpto, _, ec=None):
+ def jump_absolute(self, jumpto, ec):
if we_are_jitted():
#
# assume that only threads are using the bytecode counter
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
