Author: fijal
Branch: jit-leaner-frontend
Changeset: r83333:1becdcc6a2b2
Date: 2016-03-25 11:29 +0200
http://bitbucket.org/pypy/pypy/changeset/1becdcc6a2b2/
Log: fix rpython
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
@@ -2328,7 +2328,7 @@
def _compile_and_run_once(self, original_boxes):
self.initialize_state_from_start(original_boxes)
- self.current_merge_points = [(original_boxes, (0, 0))]
+ self.current_merge_points = [(original_boxes, (0, 0, 0))]
num_green_args = self.jitdriver_sd.num_green_args
original_greenkey = original_boxes[:num_green_args]
self.resumekey = compile.ResumeFromInterpDescr(original_greenkey)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
