Author: Armin Rigo <[email protected]>
Branch: remove-globals-in-jit
Changeset: r58972:693c4c1d83e6
Date: 2012-11-17 19:46 +0100
http://bitbucket.org/pypy/pypy/changeset/693c4c1d83e6/
Log: Translation fixes for test_zrpy_gc.
diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -13,7 +13,7 @@
from pypy.jit.metainterp.history import TreeLoop, Box, History, JitCellToken,
TargetToken
from pypy.jit.metainterp.history import AbstractFailDescr, BoxInt
from pypy.jit.metainterp.history import BoxPtr, BoxObj, BoxFloat, Const,
ConstInt
-from pypy.jit.metainterp import history
+from pypy.jit.metainterp import history, resume
from pypy.jit.metainterp.typesystem import llhelper, oohelper
from pypy.jit.metainterp.optimize import InvalidLoop
from pypy.jit.metainterp.inliner import Inliner
@@ -649,6 +649,7 @@
return res
class AllVirtuals:
+ list = [resume.ResumeDataDirectReader.virtual_default] # annotation hack
def __init__(self, list):
self.list = list
def hide(self, cpu):
diff --git a/pypy/jit/metainterp/resume.py b/pypy/jit/metainterp/resume.py
--- a/pypy/jit/metainterp/resume.py
+++ b/pypy/jit/metainterp/resume.py
@@ -706,6 +706,7 @@
# allocate() methods must fill in the cache as soon as they
# have the object, before they fill its fields.
assert self.virtuals_cache is not None
+ assert self.rd_virtuals is not None
v = self.virtuals_cache[index]
if not v:
v = self.rd_virtuals[index].allocate(self, index)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
