[pypy-svn] r61778 - pypy/branch/pyjitpl5/pypy/jit/metainterp

[fijal at codespeak.net]

Author: fijal
Date: Thu Feb 12 13:54:21 2009
New Revision: 61778

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
Log:
(arigo, fijal)
A trivial fix for startboxes


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py	Thu Feb 12 13:54:21 2009
@@ -238,7 +238,8 @@
                 fieldbox = op.args[1]
                 assert isinstance(fieldbox, ConstInt)
                 field = fieldbox.getint()
-                instnode.curfields[field] = self.getnode(op.args[2])
+                fieldnode = self.getnode(op.args[2])
+                instnode.curfields[field] = fieldnode
                 continue
             elif opname.startswith('getfield_gc_'):
                 instnode = self.getnode(op.args[0])
@@ -252,6 +253,8 @@
                     fieldnode = instnode.origfields[field]
                 else:
                     fieldnode = InstanceNode(box, escaped=False)
+                    if instnode.startbox:
+                        fieldnode.startbox = True
                     instnode.origfields[field] = fieldnode
                 self.nodes[box] = fieldnode
                 continue