Author: Carl Friedrich Bolz <[email protected]>
Branch: small-unroll-improvements
Changeset: r70647:f96b890d7ea5
Date: 2014-04-16 09:57 +0200
http://bitbucket.org/pypy/pypy/changeset/f96b890d7ea5/
Log: fix translation - turns out a mixin doesn't work
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py
b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -506,8 +506,7 @@
s.debug_print(" ", seen, bad, metainterp_sd)
-class VirtualStateConstructor(object):
- import_from_mixin(VirtualVisitor)
+class VirtualStateConstructor(VirtualVisitor):
def __init__(self, optimizer):
self.fieldboxes = {}
diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython/jit/metainterp/resume.py
@@ -268,14 +268,15 @@
_frame_info_placeholder = (None, 0, 0)
-class ResumeDataVirtualAdder(object):
- import_from_mixin(VirtualVisitor)
+class ResumeDataVirtualAdder(VirtualVisitor):
def __init__(self, storage, memo):
self.storage = storage
self.memo = memo
def make_virtual_info(self, value, fieldnums):
+ from rpython.jit.metainterp.optimizeopt.virtualize import
AbstractVirtualValue
+ assert isinstance(value, AbstractVirtualValue)
assert fieldnums is not None
vinfo = value._cached_vinfo
if vinfo is not None and vinfo.equals(fieldnums):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
