[pypy-commit] pypy memoryerror3: LoopVersion _attrs_ added, renamed _compiled to compile_data

[plan_rich]

Author: Richard Plangger <rich at pasra.at>
Branch: memoryerror3
Changeset: r79189:e679d3e0131f
Date: 2015-08-24 12:14 +0200
http://bitbucket.org/pypy/pypy/changeset/e679d3e0131f/

Log:	LoopVersion _attrs_ added, renamed _compiled to compile_data

diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -208,7 +208,7 @@
                                    version.operations, jitcell_token)
             record_loop_or_bridge(metainterp_sd, vl)
             assert asminfo is not None
-            version._compiled = asminfo
+            version.compile_data = asminfo
             faildescr.version = None
         # stitch the rest of the traces
         for lv in loop.versions:
@@ -219,7 +219,7 @@
             for faildescr in lv.faildescrs:
                 version = faildescr.version
                 if version and version.compiled():
-                    cpu.stitch_bridge(faildescr, version._compiled)
+                    cpu.stitch_bridge(faildescr, version.compile_data)
                 faildescr.version = None
     loop.versions = None
 
diff --git a/rpython/jit/metainterp/history.py b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -747,10 +747,18 @@
     return -1
 
 class LoopVersion(object):
+    _attrs_ = ('faildescrs', 'compile_data',
+               'operations', 'inputargs',
+               'renamed_inputargs')
+
+    faildescrs = []
+    compile_data = None
+    operations = None
+    inputargs = None
+    renamed_inputargs = None
 
     def __init__(self, loop):
         self.faildescrs = []
-        self._compiled = None
         if loop:
             self.operations = self.copy_operations(loop.operations) 
             idx = index_of_first(rop.LABEL, self.operations)
@@ -758,17 +766,13 @@
             label = self.operations[idx]
             self.inputargs = label.getarglist()
             self.renamed_inputargs = label.getarglist()
-        else:
-            self.operations = None
-            self.inputargs = None
-            self.renamed_inputargs = None
 
     def compiled(self):
         if self.operations is None:
             # root version must always be compiled
             return True
 
-        return self._compiled is not None
+        return self.compile_data is not None
 
     def copy_operations(self, operations):
         from rpython.jit.metainterp.compile import ResumeGuardDescr, CompileLoopVersionDescr