[pypy-commit] pypy default: corner case not handled very well

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: 
Changeset: r48683:ce8c2eb5ccba
Date: 2011-11-03 08:49 +0100
http://bitbucket.org/pypy/pypy/changeset/ce8c2eb5ccba/

Log:	corner case not handled very well

diff --git a/pypy/jit/metainterp/optimizeopt/optimizer.py b/pypy/jit/metainterp/optimizeopt/optimizer.py
--- a/pypy/jit/metainterp/optimizeopt/optimizer.py
+++ b/pypy/jit/metainterp/optimizeopt/optimizer.py
@@ -95,6 +95,10 @@
         return guards
 
     def import_from(self, other, optimizer):
+        if self.level == LEVEL_CONSTANT:
+            assert other.level == LEVEL_CONSTANT
+            assert other.box.same_constant(self.box)
+            return
         assert self.level <= LEVEL_NONNULL
         if other.level == LEVEL_CONSTANT:
             self.make_constant(other.get_key_box())