[pypy-svn] r69791 - in pypy/branch/virtual-forcing/pypy/jit/metainterp: . test

[arigo at codespeak.net]

Author: arigo
Date: Tue Dec  1 11:23:16 2009
New Revision: 69791

Modified:
   pypy/branch/virtual-forcing/pypy/jit/metainterp/resume.py
   pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_resume.py
Log:
Get rid of the "except AttributeError" hack.  Instead,
write the _already_allocated_resume_virtuals attribute
explicitly in fake MetaInterp classes.


Modified: pypy/branch/virtual-forcing/pypy/jit/metainterp/resume.py
==============================================================================
--- pypy/branch/virtual-forcing/pypy/jit/metainterp/resume.py	(original)
+++ pypy/branch/virtual-forcing/pypy/jit/metainterp/resume.py	Tue Dec  1 11:23:16 2009
@@ -472,10 +472,7 @@
 
     def _prepare_virtuals(self, metainterp, virtuals):
         if virtuals:
-            try:
-                v = metainterp._already_allocated_resume_virtuals
-            except AttributeError:
-                v = None
+            v = metainterp._already_allocated_resume_virtuals
             if v is None:
                 self.virtuals = [None] * len(virtuals)
                 for i in range(len(virtuals)):

Modified: pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_resume.py
==============================================================================
--- pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_resume.py	(original)
+++ pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_resume.py	Tue Dec  1 11:23:16 2009
@@ -41,6 +41,8 @@
     assert not tagged_list_eq([tag(1, TAGBOX), tag(-2, TAGBOX)], [tag(1, TAGBOX)])
 
 class MyMetaInterp:
+    _already_allocated_resume_virtuals = None
+
     def __init__(self, cpu=None):
         if cpu is None:
             cpu = LLtypeMixin.cpu
@@ -124,6 +126,7 @@
         rd_numb = []
         rd_consts = []
     class FakeMetainterp(object):
+        _already_allocated_resume_virtuals = None
         cpu = None
     reader = ResumeDataReader(FakeStorage(), [], FakeMetainterp())
     assert reader.virtuals == ["allocated", None]