Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: optresult
Changeset: r77753:1ea860301814
Date: 2015-06-02 10:49 +0200
http://bitbucket.org/pypy/pypy/changeset/1ea860301814/
Log: minor fixes
diff --git a/rpython/jit/backend/llsupport/rewrite.py
b/rpython/jit/backend/llsupport/rewrite.py
--- a/rpython/jit/backend/llsupport/rewrite.py
+++ b/rpython/jit/backend/llsupport/rewrite.py
@@ -85,6 +85,7 @@
def emit_op(self, op):
op = self.get_box_replacement(op)
+ orig_op = op
# XXX specialize on number of args
replaced = False
for i in range(op.numargs()):
@@ -93,11 +94,13 @@
if orig_arg is not arg:
if not replaced:
op = op.copy_and_change(op.getopnum())
+ orig_op.set_forwarded(op)
replaced = True
op.setarg(i, arg)
if op.is_guard():
if not replaced:
op = op.copy_and_change(op.getopnum())
+ orig_op.set_forwarded(op)
op.setfailargs([self.get_box_replacement(a)
for a in op.getfailargs()])
self._newops.append(op)
diff --git a/rpython/jit/metainterp/pyjitpl.py
b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2985,9 +2985,8 @@
def do_not_in_trace_call(self, allboxes, descr):
self.clear_exception()
- resbox = executor.execute_varargs(self.cpu, self, rop.CALL,
+ executor.execute_varargs(self.cpu, self, rop.CALL_N,
allboxes, descr)
- assert resbox is None
if self.last_exc_value_box is not None:
# cannot trace this! it raises, so we have to follow the
# exception-catching path, but the trace doesn't contain
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
