[pypy-svn] pypy jit-short_from_state: we cant allow boxes not originating from the inputargs, even if they are constant since we have to check that they are still constant in the short preamble

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-short_from_state
Changeset: r43526:d436870b52d4
Date: 2011-04-22 09:28 +0200
http://bitbucket.org/pypy/pypy/changeset/d436870b52d4/

Log:	we cant allow boxes not originating from the inputargs, even if they
	are constant since we have to check that they are still constant in
	the short preamble

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
@@ -387,12 +387,11 @@
     def produce_short_preamble_box(self, box, short_boxes, potential_ops):
         if box in short_boxes:
             return 
-        if isinstance(box, Const): #self.getvalue(box).is_constant():
+        if isinstance(box, Const):
             return 
         if box in potential_ops:
             op = potential_ops[box]
             for arg in op.getarglist():
-                arg = self.getvalue(arg).get_key_box()
                 self.produce_short_preamble_box(arg, short_boxes,
                                                 potential_ops)
             short_boxes[box] = op