Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r70771:27d58254e679
Date: 2014-04-19 14:50 +0200
http://bitbucket.org/pypy/pypy/changeset/27d58254e679/
Log: fix
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -79,8 +79,9 @@
# only used for no-jit. The jit-jitdriver is
# in interp_jit.py
stmonly_jitdriver.jit_merge_point(
- self=self, co_code=co_code,
- next_instr=next_instr, ec=ec)
+ frame=self, pycode=co_code,
+ next_instr=next_instr, ec=ec,
+ is_being_profiled=self.is_being_profiled)
next_instr = self.handle_bytecode(co_code, next_instr, ec)
rstm.update_marker_num(intmask(next_instr) * 2 + 1)
except ExitFrame:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
