[pypy-commit] pypy default: Backed out changeset 57d177436b84

[fijal]

Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: 
Changeset: r75013:01fc6eb5e20c
Date: 2014-12-18 14:47 +0200
http://bitbucket.org/pypy/pypy/changeset/01fc6eb5e20c/

Log:    Backed out changeset 57d177436b84

diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py 
b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -107,9 +107,7 @@
             assert other.level == LEVEL_CONSTANT
             assert other.box.same_constant(self.box)
             return
-        if self.level == LEVEL_KNOWNCLASS:
-            return
-        #assert self.level <= LEVEL_NONNULL
+        assert self.level <= LEVEL_NONNULL
         if other.level == LEVEL_CONSTANT:
             self.make_constant(other.get_key_box())
             optimizer.turned_constant(self)
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
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit