[pypy-commit] pypy default: someone has to explain to me why this is not reasonable

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r75011:57d177436b84
Date: 2014-12-18 10:45 +0200
http://bitbucket.org/pypy/pypy/changeset/57d177436b84/

Log:	someone has to explain to me why this is not reasonable

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,7 +107,9 @@
             assert other.level == LEVEL_CONSTANT
             assert other.box.same_constant(self.box)
             return
-        assert self.level <= LEVEL_NONNULL
+        if self.level == LEVEL_KNOWNCLASS:
+            return
+        #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,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