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

[fijal at codespeak.net]

Author: fijal
Date: Fri Mar  6 23:35:38 2009
New Revision: 62672

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
Log:
trivial translation fixes


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	Fri Mar  6 23:35:38 2009
@@ -72,8 +72,8 @@
                 if instnode.cursize == -1:
                     # fish fish fish
                     instnode.cursize = executor.execute(cpu, rop.ARRAYLEN_GC,
-                                                        [instnode.source, ad]
-                                                        ).getint()
+                                                        [instnode.source],
+                                                        ad).getint()
                 self.list_allocations.append((ad, instnode.cursize))
                 res = (alloc_offset + 1) << 16
             else:
@@ -142,13 +142,19 @@
                 node.escape_if_startbox(memo)
         else:
             for key, node in self.curfields.items():
-                esc_self = self.vdesc and key not in self.vdesc.virtuals
+                if self.vdesc and key not in self.vdesc.virtuals:
+                    esc_self = True
+                else:
+                    esc_self = False
                 node.escape_if_startbox(memo, esc_self)
             # 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.curfields:
-                    esc_self = self.vdesc and key not in self.vdesc.virtuals
+                    if self.vdesc and key not in self.vdesc.virtuals:
+                        esc_self = True
+                    else:
+                        esc_self = False
                     node.escape_if_startbox(memo, esc_self)
 
     def add_to_dependency_graph(self, other, dep_graph):