[pypy-commit] pypy default: this broke stuff, revert

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r75009:1568f745143e
Date: 2014-12-18 10:13 +0200
http://bitbucket.org/pypy/pypy/changeset/1568f745143e/

Log:	this broke stuff, revert

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,6 +97,7 @@
             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,7 +638,6 @@
             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