[pypy-svn] r63556 - pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp

[fijal at codespeak.net]

Author: fijal
Date: Fri Apr  3 04:27:49 2009
New Revision: 63556

Modified:
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/optimize.py
Log:
fix pypy on top of jit


Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/optimize.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/optimize.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/optimize.py	Fri Apr  3 04:27:49 2009
@@ -125,6 +125,7 @@
         else:
             known_class = other.cls.source
         if (other.escaped and not other.virtualized):# and
+            assert not self.virtualized
             #not self.expanded_fields):
             if self.cls is None:
                 return NotSpecNode()
@@ -551,6 +552,8 @@
 #                 rebuild_ops.append(op1)
 #         # end of code for dirtyfields support
 
+        newboxes = [self.nodes[arg].source for arg in op_fail.args]
+        op_fail.args = newboxes
         rebuild_ops.append(op_fail)
         op1 = op.clone()
         op1.suboperations = rebuild_ops