Author: Hakan Ardo <[email protected]>
Branch: jit-short_from_state
Changeset: r44354:a9949bd04368
Date: 2011-05-21 15:41 +0200
http://bitbucket.org/pypy/pypy/changeset/a9949bd04368/
Log: hg merge
diff --git a/pypy/jit/metainterp/pyjitpl.py b/pypy/jit/metainterp/pyjitpl.py
--- a/pypy/jit/metainterp/pyjitpl.py
+++ b/pypy/jit/metainterp/pyjitpl.py
@@ -1951,10 +1951,7 @@
self.history.inputargs = original_boxes[num_green_args:]
greenkey = original_boxes[:num_green_args]
self.history.record(rop.JUMP, live_arg_boxes[num_green_args:], None)
-
- assert start > 0
- assert self.history.operations[start-1].getopnum() ==
rop.DEBUG_MERGE_POINT
- loop_token = compile.compile_new_loop(self, [], greenkey, start-1,
+ loop_token = compile.compile_new_loop(self, [], greenkey, start,
start_resumedescr, False)
self.history.operations.pop() # remove the JUMP
if loop_token is None:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
