Author: Maciej Fijalkowski <[email protected]>
Branch: 
Changeset: r75036:1f3bc0c62780
Date: 2014-12-19 14:41 +0200
http://bitbucket.org/pypy/pypy/changeset/1f3bc0c62780/

Log:    backout step 1

diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py 
b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -97,7 +97,6 @@
             jumpop = None
 
         self.import_state(start_label, starting_state)
-
         self.optimizer.propagate_all_forward(clear=False)
 
         if not jumpop:
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py 
b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -638,6 +638,7 @@
             for i in range(op.numargs()):
                 op.setarg(i, self.renamed(op.getarg(i)))
         if box in self.short_boxes:
+            return
             if op is None:
                 oldop = self.short_boxes[box].clone()
                 oldres = oldop.result
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to