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

[fijal at codespeak.net]

Author: fijal
Date: Tue Mar  3 14:49:51 2009
New Revision: 62475

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py
Log:
Grr, fix the translation


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	Tue Mar  3 14:49:51 2009
@@ -143,12 +143,13 @@
                 node.escape_if_startbox(memo)
         else:
             for key, node in self.curfields.items():
-                if key not in self.vdesc.virtuals:
+                if self.vdesc and key not in self.vdesc.virtuals:
                     node.escape_if_startbox(memo)
             # we also need to escape fields that are only read, never written,
             # if they're not marked specifically as ones that does not escape
             for key, node in self.origfields.items():
-                if key not in self.vdesc.virtuals and key not in self.curfields:
+                if (self.vdesc and key not in self.vdesc.virtuals and
+                    key not in self.curfields):
                     node.escape_if_startbox(memo)
 
     def add_to_dependency_graph(self, other, dep_graph):

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py	Tue Mar  3 14:49:51 2009
@@ -14,6 +14,9 @@
     storage_info = None
     liveboxes = None
 
+    # for 'guard_nonvirtualizable'
+    desc = None
+
     def __init__(self, opnum, args, result):
         assert isinstance(opnum, int)
         self.opnum = opnum